pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/rust rust: Darwin/aarch64 must use bundled llvm.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/01266f988c43
branches:  trunk
changeset: 456032:01266f988c43
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Sat Jul 17 13:16:38 2021 +0000

description:
rust: Darwin/aarch64 must use bundled llvm.

diffstat:

 lang/rust/options.mk |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r 2a8024770d31 -r 01266f988c43 lang/rust/options.mk
--- a/lang/rust/options.mk      Sat Jul 17 08:11:36 2021 +0000
+++ b/lang/rust/options.mk      Sat Jul 17 13:16:38 2021 +0000
@@ -1,17 +1,19 @@
-# $NetBSD: options.mk,v 1.15 2021/07/11 22:13:38 he Exp $
+# $NetBSD: options.mk,v 1.16 2021/07/17 13:16:38 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=        rust-cargo-static
+PKG_SUPPORTED_OPTIONS+=        rust-llvm
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-# The bundled LLVM current has issues building on SunOS.
-.if ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
-PKG_SUPPORTED_OPTIONS+=                rust-llvm
 # There may be compatibility issues with base LLVM.
-.  if !empty(HAVE_LLVM)
-PKG_SUGGESTED_OPTIONS+=                rust-llvm
-.  endif
+.if !empty(HAVE_LLVM)
+PKG_SUGGESTED_OPTIONS+=        rust-llvm
+.endif
+
+# macOS/arm64 currently cannot used shared llvm
+.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
+PKG_SUGGESTED_OPTIONS+=        rust-llvm
 .endif
 
 # Bundle OpenSSL and curl into the cargo binary when producing



Home | Main Index | Thread Index | Old Index