diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-05-29 06:20:15 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-05-29 06:20:15 +0000 |
| commit | f661dbee816b5fc7b1b9f6d4486ada609921ad59 (patch) | |
| tree | 722a245536a8d4e54475044cc7b2e057a1ec771f /lib | |
| parent | 3f78f0a9506d294a064644bb3c04eb4a96e10bea (diff) | |
| download | src-f661dbee816b5fc7b1b9f6d4486ada609921ad59.tar.gz src-f661dbee816b5fc7b1b9f6d4486ada609921ad59.zip | |
GCC External: Revert r300886, r300904, r300917, r300918
The fix in r300873 is mostly enough. A fix for lib32 will be
committed.separately.
Notes
Notes:
svn path=/head/; revision=300943
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 603e6bf7f712..6e70cf102df9 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -63,7 +63,7 @@ cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOMETA .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 diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile index 15420a692b9f..f2efe8db541f 100644 --- a/lib/libcxxrt/Makefile +++ b/lib/libcxxrt/Makefile @@ -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 |