Date: Sat, 8 Aug 2015 00:22:50 +0000 From: Brooks Davis <brooks@freebsd.org> To: marino@freebsd.org Cc: Brooks Davis <brooks@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r393705 - head/devel/llvm-cheri Message-ID: <20150808002250.GA52059@spindle.one-eyed-alien.net> In-Reply-To: <55C5494D.4050707@marino.st> References: <201508072344.t77NiYfQ010608@repo.freebsd.org> <55C548A8.9060501@marino.st> <55C5494D.4050707@marino.st>
next in thread | previous in thread | raw e-mail | index | archive | help
--9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. > >> =20 > >> On platforms where the system compiler isn't clang (including 9.x), > >> USES=3Dcompiler: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 > >> > >=20 > >=20 > > 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 >=20 > 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 393706) +++ Makefile (working copy) @@ -159,7 +159,7 @@ =20 .include <bsd.port.pre.mk> =20 -.if ${COMPILER_TYPE} !=3D clang +.if ${OPSYS} =3D=3D "FreeBSD" && ${COMPILER_TYPE} !=3D clang # Evil hack around gcc48 not providing a usable c++11 environment on 9.x PLIST_SUB:=3D ${PLIST_SUB:NLLDB=3D*} LLDB=3D"@comment " .endif @@ -171,7 +171,7 @@ ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld =20 post-extract-LLDB-on: -.if ${COMPILER_TYPE} =3D=3D clang +.if ${OPSYS} !=3D "FreeBSD" || ${COMPILER_TYPE} =3D=3D clang ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb .endif =20 @@ -206,7 +206,7 @@ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ =20 post-install-LLDB-on: -.if ${COMPILER_TYPE} =3D=3D clang +.if ${OPSYS} !=3D "FreeBSD" || ${COMPILER_TYPE} =3D=3D clang ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib .endif =20 --9jxsPFA5p3P2qPhR Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJVxUvZAAoJEKzQXbSebgfAZgEH/iGZE2EfSOYfgdhz4AIHMaEo 4igA6vj0KSOeKEInh3/7PNmys482QT8qEWdA53DHy124LRTCt7Y6LJbcKMcJofW/ 5950k0AWLh4vFsQVXmsfy5mfoYPr9saMeUshVkm9UtmzFI9wojd2bYsfWCbk3QyW P+0xot4gYFCieKtFwOvudKM8Ge2jaFtvtPCcqGzeoNKStI+5obFfe/rAvNVE0nWe CxgXpC1+xqiJxMTCS/NIq9E1nbrVy8/zGLX4uPCV8GQcXmaRVbFNneakmD/+gRUl b7zHJqNnzjVwea+m0OYPbHsBKwd3hNo6w1N6MUmQFQozdBS0qeuPQnPxrw892i4= =LnqQ -----END PGP SIGNATURE----- --9jxsPFA5p3P2qPhR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150808002250.GA52059>