pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust175: move conditional for sparc64 till after options are known.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sun Mar 10 22:21:52 2024 +0100
Changeset:	3e12dabff280330bcdde910a78ce0854282189c1

Modified Files:
	rust175/options.mk

Log Message:
rust175: move conditional for sparc64 till after options are known.

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

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

diffstat:
 rust175/options.mk | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diffs:
diff --git a/rust175/options.mk b/rust175/options.mk
index 351ff1576a..26419c6beb 100644
--- a/rust175/options.mk
+++ b/rust175/options.mk
@@ -19,17 +19,6 @@ PKG_SUGGESTED_OPTIONS+=		rust-internal-llvm
 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).


Home | Main Index | Thread Index | Old Index