pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust176: 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:20:07 2024 +0100
Changeset: 9f61c01437e1def6af691af57d93421d3ea63e2a
Modified Files:
rust176/options.mk
Log Message:
rust176: 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=9f61c01437e1def6af691af57d93421d3ea63e2a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust176/options.mk | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diffs:
diff --git a/rust176/options.mk b/rust176/options.mk
index 9907c3dbd2..b6608e8f05 100644
--- a/rust176/options.mk
+++ b/rust176/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