CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   he
Date:           Wed Oct 28 11:41:26 UTC 2020

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
Further space-optimize when building natively on earmv7hf; only
build llvm with the ARM CPU target, but when cross-building on X86,
X86 needs to also be built, due to 2-stage build process.


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 pkgsrc/lang/rust/Makefile

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.198 pkgsrc/lang/rust/Makefile:1.199
--- pkgsrc/lang/rust/Makefile:1.198     Wed Oct 28 11:16:46 2020
+++ pkgsrc/lang/rust/Makefile   Wed Oct 28 11:41:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.198 2020/10/28 11:16:46 he Exp $
+# $NetBSD: Makefile,v 1.199 2020/10/28 11:41:26 he Exp $
 
 DISTNAME=      rustc-1.46.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -76,9 +76,11 @@ CHECK_SSP_SUPPORTED= no
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf)
+    !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \
+    !empty(TARGET:Marmv7-unknown-netbsd-eabihf)
 # Bootstrapping on NetBSD/powerpc requires no debug-info from rustc
 # (both for amd64->powerpc built and powerpc->powerpc built bootstrap bits)
+# Also try to downsize the armv7 build.
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --disable-debug-assertions
 CONFIGURE_ARGS+=       --disable-llvm-release-debuginfo
@@ -90,9 +92,12 @@ CONFIGURE_ARGS+=     --debuginfo-level-tests
 .endif
 
 # Only build the ARM target on/for this host, due to resource constraints
-# (X86 needs to go along due to 2-stage build process)
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \
-    !empty(TARGET:Marmv7-unknown-netbsd-eabihf)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf)
+CONFIGURE_ARGS+=       --set llvm.targets="ARM"
+.endif
+# When cross-building for ARM on X86, X86 needs to go along due
+# to 2-stage build process
+.if !empty(TARGET:Marmv7-unknown-netbsd-eabihf)
 CONFIGURE_ARGS+=       --set llvm.targets="ARM;X86"
 .endif