CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Mar 10 21:24:36 UTC 2024

Modified Files:
        pkgsrc/lang/rust: options.mk

Log Message:
lang/rust: move conditional for sparc64 to after when options are known.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/rust/options.mk

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/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.36 pkgsrc/lang/rust/options.mk:1.37
--- pkgsrc/lang/rust/options.mk:1.36    Mon Mar  4 16:01:07 2024
+++ pkgsrc/lang/rust/options.mk Sun Mar 10 21:24:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.36 2024/03/04 16:01:07 he Exp $
+# $NetBSD: options.mk,v 1.37 2024/03/10 21:24:36 he Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=        rust-cargo-static rust-docs
@@ -19,17 +19,6 @@ PKG_SUGGESTED_OPTIONS+=              rust-internal-l
 PKG_SUGGESTED_OPTIONS+=                rust-internal-llvm
 .endif
 
-# NetBSD/sparc64 when using the internal LLVM needs
-# to not use gcc 10.4 or 10.5 (as found in 10.0_BETA or 10.0), ref.
-# https://github.com/rust-lang/rust/issues/117231
-# (however, gcc from 9.x produces a working LLVM).
-.if ${MACHINE_PLATFORM:MNetBSD-10.*-sparc64}
-.  if !empty(PKG_OPTIONS:Mrust-internal-llvm)
-# Require GCC 12 (from pkgsrc) to correctly build the embedded LLVM (17.x).
-GCC_REQD+=     12
-.  endif
-.endif
-
 # Bundle OpenSSL and curl into the cargo binary when producing
 # bootstraps on NetBSD.
 .if ${OPSYS} == "NetBSD" && ${BUILD_TARGET} == "dist"
@@ -53,6 +42,17 @@ CONFIGURE_ARGS+=     --llvm-libunwind=system
 CONFIGURE_ARGS+=       --llvm-root=${BUILDLINK_PREFIX.llvm}
 .endif
 
+# NetBSD/sparc64 when using the internal LLVM needs
+# to not use gcc 10.4 or 10.5 (as found in 10.0_BETA or 10.0), ref.
+# https://github.com/rust-lang/rust/issues/117231
+# (however, gcc from 9.x produces a working LLVM).
+.if ${MACHINE_PLATFORM:MNetBSD-10.*-sparc64}
+.  if !empty(PKG_OPTIONS:Mrust-internal-llvm)
+# Require GCC 12 (from pkgsrc) to correctly build the embedded LLVM (17.x).
+GCC_REQD+=     12
+.  endif
+.endif
+
 #
 # Link cargo statically against "native" libraries.
 # (openssl and curl specifically).