CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Oct 24 08:08:45 UTC 2022

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: adjust for armv6 (as for armv7), as done in wip pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 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.268 pkgsrc/lang/rust/Makefile:1.269
--- pkgsrc/lang/rust/Makefile:1.268     Sun Oct 23 14:48:31 2022
+++ pkgsrc/lang/rust/Makefile   Mon Oct 24 08:08:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.268 2022/10/23 14:48:31 he Exp $
+# $NetBSD: Makefile,v 1.269 2022/10/24 08:08:44 he Exp $
 
 DISTNAME=      rustc-1.63.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -102,11 +102,11 @@ BUILD_TARGET?=            build
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \
-    !empty(TARGET:Marmv7-unknown-netbsd-eabihf)
+    !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || \
+    !empty(TARGET:Marmv[67]-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.
+# Also try to downsize the armv[67] build.
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --disable-debug-assertions
 CONFIGURE_ARGS+=       --disable-llvm-release-debuginfo
@@ -118,12 +118,12 @@ CONFIGURE_ARGS+=  --debuginfo-level-tests
 .endif
 
 # Only build the ARM target on/for this host, due to resource constraints
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf)
 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)
+.if !empty(TARGET:Marmv[67]-unknown-netbsd-eabihf)
 CONFIGURE_ARGS+=       --set llvm.targets="ARM;X86"
 .endif