From owner-svn-ports-head@FreeBSD.ORG  Wed Oct 30 14:03:47 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 02D735B5;
 Wed, 30 Oct 2013 14:03:47 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C8E49240D;
 Wed, 30 Oct 2013 14:03:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UE3kNW098096;
 Wed, 30 Oct 2013 14:03:46 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UE3kji098090;
 Wed, 30 Oct 2013 14:03:46 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201310301403.r9UE3kji098090@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 30 Oct 2013 14:03:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332110 - in head/devel: llvm32 llvm33
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Oct 2013 14:03:47 -0000

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@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}