Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 May 2016 20:45:32 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r300873 - in head/lib: libc++ libcxxrt
Message-ID:  <201605272045.u4RKjWQX047129@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Fri May 27 20:45:32 2016
New Revision: 300873
URL: https://svnweb.freebsd.org/changeset/base/300873

Log:
  After r300770, for libc++ and libcxxrt, use -isystem instead of -I.
  This should fix builds with external gcc toolchains from ports, which
  also use -isystem to work around problems with gcc's --sysroot
  implementation.  Thanks to Bryan Drewery for this workaround.

Modified:
  head/lib/libc++/Makefile
  head/lib/libcxxrt/Makefile

Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile	Fri May 27 20:43:46 2016	(r300872)
+++ head/lib/libc++/Makefile	Fri May 27 20:45:32 2016	(r300873)
@@ -63,7 +63,7 @@ cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOME
 .endfor
 
 WARNS=		0
-CFLAGS+=	-I${HDRDIR} -I${_LIBCXXRTDIR} -nostdinc++ -nostdlib -DLIBCXXRT
+CFLAGS+=	-isystem ${HDRDIR} -isystem ${_LIBCXXRTDIR} -nostdinc++ -nostdlib -DLIBCXXRT
 .if empty(CXXFLAGS:M-std=*)
 CXXFLAGS+=	-std=c++11
 .endif

Modified: head/lib/libcxxrt/Makefile
==============================================================================
--- head/lib/libcxxrt/Makefile	Fri May 27 20:43:46 2016	(r300872)
+++ head/lib/libcxxrt/Makefile	Fri May 27 20:45:32 2016	(r300873)
@@ -21,7 +21,7 @@ SRCS+=		libelftc_dem_gnu3.c\
 		guard.cc
 
 WARNS=		0
-CFLAGS+=	-I${SRCDIR} -nostdinc++
+CFLAGS+=	-isystem ${SRCDIR} -nostdinc++
 .if empty(CXXFLAGS:M-std=*)
 CXXFLAGS+=	-std=c++11
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605272045.u4RKjWQX047129>