Date: Fri, 7 Aug 2015 23:44:34 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393705 - head/devel/llvm-cheri Message-ID: <201508072344.t77NiYfQ010608@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Aug 7 23:44:33 2015 New Revision: 393705 URL: https://svnweb.freebsd.org/changeset/ports/393705 Log: Disable LLDB when the chosen compiler is gcc. On platforms where the system compiler isn't clang (including 9.x), USES=compiler:c++11-lib uses gcc48 as the compiler. Unfortunatly, gcc48 does not provide a sufficently complient c++11 environment to build LLDB when compiled on 9.x and possiably on other platforms. Modified: head/devel/llvm-cheri/Makefile Modified: head/devel/llvm-cheri/Makefile ============================================================================== --- head/devel/llvm-cheri/Makefile Fri Aug 7 21:17:38 2015 (r393704) +++ head/devel/llvm-cheri/Makefile Fri Aug 7 23:44:33 2015 (r393705) @@ -2,11 +2,12 @@ PORTNAME= llvm PORTVERSION= 3.8.d20150730 +PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} MAINTAINER= brooks@FreeBSD.org -COMMENT= LLVM and Clang +COMMENT= LLVM and Clang with support for the CHERI architecture LLVM_SUFFIX= -cheri LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} @@ -49,7 +50,7 @@ DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON -DLLVM_BUILD_DOCS=ON DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} LIT_DESC= Install lit and FileCheck test tools -LLDB_DESC= Install lldb, the LLVM debugger +LLDB_DESC= Install lldb, the LLVM debugger (ignore on 9.x) LLDB_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 LLDB_GH_PROJECT= lldb:lldb LLDB_GH_TAGNAME= ${LLDB_COMMIT}:lldb @@ -137,15 +138,18 @@ NOT_FOR_ARCH= ia64 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -BROKEN= GCC failing on 8.x +.if ${COMPILER_TYPE} != clang +# Evil hack around gcc48 not providing a usable c++11 environment on 9.x +PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment " .endif post-extract-CLANG-on: ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang post-extract-LLDB-on: +.if ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb +.endif post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ @@ -175,7 +179,9 @@ post-install-DOCS-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ post-install-LLDB-on: +.if ${COMPILER_TYPE} == clang ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib +.endif post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508072344.t77NiYfQ010608>