svn commit: r332110 - in head/devel: llvm32 llvm33

[Brooks Davis]

Author: brooks
Date: Wed Oct 30 14:03:46 2013
New Revision: 332110
URL: http://svnweb.freebsd.org/changeset/ports/332110

Log:
  Fix install with ASSERTS option enabled.
  
  Submitted by:	Cary <cary at SDF.ORG>

Modified:
  head/devel/llvm32/Makefile
  head/devel/llvm33/Makefile

Modified: head/devel/llvm32/Makefile
==============================================================================
--- head/devel/llvm32/Makefile	Wed Oct 30 13:52:16 2013	(r332109)
+++ head/devel/llvm32/Makefile	Wed Oct 30 14:03:46 2013	(r332110)
@@ -85,8 +85,10 @@ STRIP_LIBS=	BugpointPasses.so \
 
 .if ${PORT_OPTIONS:MASSERTS}
 CONFIGURE_ARGS+=	--enable-assertions
+RELEASE_TYPE=		Release+Asserts
 .else
 CONFIGURE_ARGS+=	--disable-assertions
+RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
@@ -207,7 +209,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}
-	${INSTALL_PROGRAM} ${WRKSRC}/Release/bin/FileCheck \
+	${INSTALL_PROGRAM} ${WRKSRC}/${RELEASE_TYPE}/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}

Modified: head/devel/llvm33/Makefile
==============================================================================
--- head/devel/llvm33/Makefile	Wed Oct 30 13:52:16 2013	(r332109)
+++ head/devel/llvm33/Makefile	Wed Oct 30 14:03:46 2013	(r332110)
@@ -89,8 +89,10 @@ CONFIGURE_ARGS+=--enable-experimental-ta
 
 .if ${PORT_OPTIONS:MASSERTS}
 CONFIGURE_ARGS+=	--enable-assertions
+RELEASE_TYPE=		Release+Asserts
 .else
 CONFIGURE_ARGS+=	--disable-assertions
+RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
@@ -211,7 +213,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}
-	${INSTALL_PROGRAM} ${WRKSRC}/Release/bin/FileCheck \
+	${INSTALL_PROGRAM} ${WRKSRC}/${RELEASE_TYPE}/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}