svn commit: r446858 - head/lang/rust

[Jean-Sébastien Pédron]

Author: dumbbell
Date: Fri Jul 28 22:30:39 2017
New Revision: 446858
URL: https://svnweb.freebsd.org/changeset/ports/446858

Log:
  lang/rust: Fix build with PORT_LLVM
  
  The path to `llvm-config40` was set to the empty string in the generated
  `config.toml`, because I was still using the ${LLVM_PREFIX} variable
  instead of the appropriate ${LLVM_CONFIG}. Bad completion and lack of
  testing, sorry for that...
  
  Reported by:	Rainer Hurling <rhurlin at gwdg.de>,
  		Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>,
  		dim@

Modified:
  head/lang/rust/Makefile

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Fri Jul 28 22:23:24 2017	(r446857)
+++ head/lang/rust/Makefile	Fri Jul 28 22:30:39 2017	(r446858)
@@ -72,6 +72,7 @@ PLIST_SUB+=		RUST_TARGET=${RUST_TARGET}
 USES=		compiler gmake libedit python:2.7,build
 
 OPTIONS_DEFINE=		DOCS GDB LLNEXTGEN PORT_LLVM
+OPTIONS_DEFAULT=	PORT_LLVM
 GDB_DESC=		Install ports gdb (necessary for debugging rust programs)
 LLNEXTGEN_DESC=		Build with grammar verification
 
@@ -197,7 +198,7 @@ post-configure-DOCS-off:
 	${REINPLACE_CMD} -e 's,%DOCS%,false,' ${WRKSRC}/config.toml
 
 post-configure-PORT_LLVM-on:
-	${REINPLACE_CMD} -e 's,%LLVM_CONFIG%,${LLVM_PREFIX},' ${WRKSRC}/config.toml
+	${REINPLACE_CMD} -e 's,%LLVM_CONFIG%,${LLVM_CONFIG},' ${WRKSRC}/config.toml
 
 post-configure-PORT_LLVM-off:
 	${REINPLACE_CMD} -e '/%LLVM_CONFIG%/d' ${WRKSRC}/config.toml