rust: do-cross.mk -- change whitespace to space-tab.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Thu Dec 22 15:49:02 2022 +0000
Changeset:	fcc4c17fa2cbbc01867f72b1930386005f168d07

Modified Files:
	rust/do-cross.mk
	rust/files/gcc-wrap

Log Message:
rust: do-cross.mk -- change whitespace to space-tab.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fcc4c17fa2cbbc01867f72b1930386005f168d07

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/do-cross.mk    | 18 +++++++++---------
 rust/files/gcc-wrap |  7 +++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diffs:
diff --git a/rust/do-cross.mk b/rust/do-cross.mk
index 0e9a904194..e2d0d61521 100644
--- a/rust/do-cross.mk
+++ b/rust/do-cross.mk
@@ -5,15 +5,15 @@
 VERSION!=	make show-var VARNAME=PKGVERSION
 V_NOREV!=	make show-var VARNAME=PKGVERSION_NOREV
 
-SHORT_TARGETS+=		armv7
-SHORT_TARGETS+=		armv6
-SHORT_TARGETS+=		sparc64
-SHORT_TARGETS+=		powerpc
-SHORT_TARGETS+=		powerpc90
-SHORT_TARGETS+=		arm64
-SHORT_TARGETS+=		arm64_be
-SHORT_TARGETS+=		i386
-#SHORT_TARGETS+=	mipsel	# produces 64-bit mips instructions(!)
+SHORT_TARGETS+= 	armv7
+SHORT_TARGETS+= 	armv6
+SHORT_TARGETS+= 	sparc64
+SHORT_TARGETS+= 	powerpc
+SHORT_TARGETS+= 	powerpc90
+SHORT_TARGETS+= 	arm64
+SHORT_TARGETS+= 	arm64_be
+SHORT_TARGETS+= 	i386
+#SHORT_TARGETS+= 	mipsel	# produces mips32 (not mips1) executables
 
 # Conditional local overrides of ROOT.* variables:
 .sinclude "local-roots.mk"
diff --git a/rust/files/gcc-wrap b/rust/files/gcc-wrap
index a79d4215f9..957ebfa032 100644
--- a/rust/files/gcc-wrap
+++ b/rust/files/gcc-wrap
@@ -30,6 +30,10 @@ else
 				# compatible with gcc7, apparently
 		i[3456]86*)	incadd="-I=/usr/include/gcc-7"
 				;;
+
+				# mips64 does soft-float
+		mips64*)	madd="-msoft-float"
+				;;
 	esac
 	# We build both for -8 and -9 due to ABI differences,
 	# so can't just test $gnuarch...  Yes, a vile hack.
@@ -42,6 +46,9 @@ fi
 who=$(basename $0 | sed -e 's/-wrap$//')
 
 args=""
+if [ ! -z "$madd" ]; then
+	args="$args $madd"
+fi
 
 # May need to add $linkadd before first -l or fist -L
 linkadd="-Wl,--sysroot=${root}/dest"