diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-05-27 23:03:44 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-05-27 23:03:44 +0000 |
| commit | ce00342bb2a88f771068f24162bbf820f01e6bf0 (patch) | |
| tree | 0cfea6e3ddff242088e35731cabddb495ceb3e37 /lib | |
| parent | 47873c16d3c25ea1be4c426dafb013703a305e3f (diff) | |
| download | src-ce00342bb2a88f771068f24162bbf820f01e6bf0.tar.gz src-ce00342bb2a88f771068f24162bbf820f01e6bf0.zip | |
Move external GCC compiler hacks to bsd.sys.mk.
This allows respecting -nostdinc, -nostdinc++ and -nostdlib before
making the decision to add in -isystem, etc. The -isystem flags
are problematic for building lib/libc++ and lib/libcxxrt which wants
to only use its own headers.
More information the need of these flags can be found at
https://gcc.gnu.org/ml/gcc/2016-03/msg00219.html
This also reverts r300873.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=300886
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc++/Makefile | 2 | ||||
| -rw-r--r-- | lib/libcxxrt/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index 5db093488d24..984e70bebe87 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -63,7 +63,7 @@ cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOMETA .endfor WARNS= 0 -CFLAGS+= -isystem ${HDRDIR} -isystem ${_LIBCXXRTDIR} -nostdinc++ -nostdlib -DLIBCXXRT +CFLAGS+= -I${HDRDIR} -I${_LIBCXXRTDIR} -nostdinc++ -nostdlib -DLIBCXXRT .if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++11 .endif diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile index f2efe8db541f..15420a692b9f 100644 --- a/lib/libcxxrt/Makefile +++ b/lib/libcxxrt/Makefile @@ -21,7 +21,7 @@ SRCS+= libelftc_dem_gnu3.c\ guard.cc WARNS= 0 -CFLAGS+= -isystem ${SRCDIR} -nostdinc++ +CFLAGS+= -I${SRCDIR} -nostdinc++ .if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++11 .endif |