[pkgsrc/trunk]: pkgsrc/lang/rust rust: Switch to pkgsrc LLVM for SunOS tempor...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5ded9a7623b
branches:  trunk
changeset: 396398:b5ded9a7623b
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu May 30 14:36:15 2019 +0000

description:
rust: Switch to pkgsrc LLVM for SunOS temporarily.

diffstat:

 lang/rust/Makefile |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 1bdedd961a68 -r b5ded9a7623b lang/rust/Makefile
--- a/lang/rust/Makefile        Thu May 30 10:26:03 2019 +0000
+++ b/lang/rust/Makefile        Thu May 30 14:36:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2019/05/14 15:48:15 he Exp $
+# $NetBSD: Makefile,v 1.99 2019/05/30 14:36:15 jperkin Exp $
 
 DISTNAME=      rustc-1.34.2-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -42,8 +42,10 @@
 CONFIGURE_ARGS+=       --disable-ninja
 # XXX: to be enabled in the future
 #CONFIGURE_ARGS+=      --jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib
-#CONFIGURE_ARGS+=      --enable-llvm-link-shared
-#CONFIGURE_ARGS+=      --llvm-root=${BUILDLINK_PREFIX.llvm}
+
+# The bundled LLVM current has issues building on SunOS.
+CONFIGURE_ARGS+=       --enable-llvm-link-shared
+CONFIGURE_ARGS+=       --llvm-root=${BUILDLINK_PREFIX.llvm}
 
 # Use "dist" build target for cross compile of bootstrap
 #BUILD_TARGET=         dist
@@ -131,6 +133,13 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+# The bundled LLVM current has issues building on SunOS.
+.if ${OPSYS} == "SunOS"
+.include "../../lang/llvm/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-llvm-link-shared
+CONFIGURE_ARGS+=       --llvm-root=${BUILDLINK_PREFIX.llvm}
+.endif
+
 #
 # Under NetBSD, do not use DT_RUNPATH
 #
@@ -467,7 +476,6 @@
 .include "../../devel/cmake/buildlink3.mk"
 #.include "../../devel/jemalloc/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-#.include "../../lang/llvm/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"