diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-03-25 06:38:23 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-03-25 06:38:23 +0000 |
| commit | 7af83eacba12793648804339e8489c06e1e978ed (patch) | |
| tree | e4ad469a8b697edb2a0e9f4ea44bb76988f55f5b | |
| parent | - Update to 5.0.11 (diff) | |
Re-enable build with ports LLVM by non-default OPTION
PR: 208250
Submitted by: jbeich
Notes
Notes:
svn path=/head/; revision=411819
| -rw-r--r-- | lang/rust/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 4640f6ccdafb..4d057c30d100 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -58,22 +58,24 @@ CONFIGURE_ARGS= --disable-valgrind --disable-docs \ --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 |