svn commit: r393705 - head/devel/llvm-cheri

[Brooks Davis]

On Sat, Aug 08, 2015 at 02:11:57AM +0200, John Marino wrote:
> On 8/8/2015 2:09 AM, John Marino wrote:
> > On 8/8/2015 1:44 AM, Brooks Davis wrote:
> >> 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
> >>
> > 
> > 
> > Unfortunately this method also disables it on DragonFly, which does have
> > GCC with full c++11 environment.  Is there a way to limit this
> > restriction to FreeBSD?  Thanks,
> > John
> 
> Ah, this is llvm-cheri.  That's never built for some reason.  I think my
> comment is valid but the change did not break DragonFly.

I suspect it's never built due to lack of OPSYS guard on a OSVERSION
check that this change removed.

Could you test the following diff against llvm-devel?  If it works for you
I'll commit it to -devel, 37, and -cheri.

-- Brooks

Index: Makefile
===================================================================
--- Makefile	(revision 393706)
+++ Makefile	(working copy)
@@ -159,7 +159,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} != clang
+.if ${OPSYS} == "FreeBSD" && ${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
@@ -171,7 +171,7 @@
 	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
 
 post-extract-LLDB-on:
-.if ${COMPILER_TYPE} == clang
+.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
 .endif
 
@@ -206,7 +206,7 @@
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
 post-install-LLDB-on:
-.if ${COMPILER_TYPE} == clang
+.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
 .endif
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20150808/96dff2fe/attachment.bin>