CVS commit: pkgsrc/lang/rust

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Jul 17 13:16:38 UTC 2021

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

Log Message:
rust: Darwin/aarch64 must use bundled llvm.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 pkgsrc/lang/rust/options.mk:1.16
--- pkgsrc/lang/rust/options.mk:1.15    Sun Jul 11 22:13:38 2021
+++ pkgsrc/lang/rust/options.mk Sat Jul 17 13:16:38 2021
@@ -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