svn commit: r411819 - head/lang/rust

[Thomas Zander]

Author: riggs
Date: Fri Mar 25 06:38:23 2016
New Revision: 411819
URL: https://svnweb.freebsd.org/changeset/ports/411819

Log:
  Re-enable build with ports LLVM by non-default OPTION
  
  PR:		208250
  Submitted by:	jbeich

Modified:
  head/lang/rust/Makefile

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Fri Mar 25 06:17:20 2016	(r411818)
+++ head/lang/rust/Makefile	Fri Mar 25 06:38:23 2016	(r411819)
@@ -58,22 +58,24 @@ CONFIGURE_ARGS=	--disable-valgrind --dis
 		--enable-clang --mandir=${MANPREFIX}/man \
 		--release-channel=${RUST_CHANNEL}
 
-# Use LLVM from ports, instead of the copy shipped with rust.
-#LLVM_VER=	36
-#BUILD_DEPENDS+=	llvm${LLVM_VER}>=0:${PORTSDIR}/devel/llvm${LLVM_VER}
-#CONFIGURE_ARGS+=--llvm-root=${LOCALBASE}/llvm${LLVM_VER}
-
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 MAKE_ARGS+=	VERBOSE=1
 .endif
 
-OPTIONS_DEFINE=		GDB LLNEXTGEN
+OPTIONS_DEFINE=		GDB LLNEXTGEN PORT_LLVM
 GDB_DESC=		Install ports gdb (necessary for debugging rust programs)
 LLNEXTGEN_DESC=		Build with grammar verification
 
 GDB_RUN_DEPENDS=		${LOCALBASE}/bin/gdb:${PORTSDIR}/devel/gdb
 LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:${PORTSDIR}/devel/llnextgen
 
+# Rust may pass more regression tests with bundled LLVM
+PORT_LLVM_DESC=	Build against devel/llvm${LLVM_VER} instead of bundled version
+PORT_LLVM_BUILD_DEPENDS=	${LLVM_PREFIX}/bin/FileCheck:${PORTSDIR}/devel/llvm${LLVM_VER}
+PORT_LLVM_CONFIGURE_ON=		--llvm-root=${LLVM_PREFIX}
+LLVM_VER?=			36 # XXX Move to DEFAULT_VERSIONS
+LLVM_PREFIX=			${LOCALBASE}/llvm${LLVM_VER}
+
 # Note that make test does not work when rust is already installed
 TEST_TARGET=	check
 TEST_ENV+=	ALLOW_NONZERO_RLIMIT_CORE=1