diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2014-05-11 21:07:00 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2014-05-11 21:07:00 +0000 |
| commit | eb941910cad1a01601278802b7194937c15fff1f (patch) | |
| tree | 637b1aa000ad6b9420456b94b498e30866aa9fe1 /gnu | |
| parent | 55298f03973650da6a63a786de542874120efb12 (diff) | |
| download | src-eb941910cad1a01601278802b7194937c15fff1f.tar.gz src-eb941910cad1a01601278802b7194937c15fff1f.zip | |
Allow libstdc++ and libsupc++ to compile with clang again, after the
bsd.*.mk infrastructure changes. Apparently, you must now modify
CXXFLAGS *before* including bsd.lib.mk, or your changes will be lost.
Notes
Notes:
svn path=/head/; revision=265895
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libstdc++/Makefile | 4 | ||||
| -rw-r--r-- | gnu/lib/libsupc++/Makefile | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index d19f9f3bb3ff..fa1d67e7ce64 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -632,9 +632,9 @@ ${VERSION_MAP}: ${SRCDIR}/config/abi/pre/gnu.ver CLEANFILES+= ${VERSION_MAP} +CXXFLAGS.clang+= -stdlib=libstdc++ + .include <bsd.lib.mk> # Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98. CXXFLAGS:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]} - -CXXFLAGS.clang+= -stdlib=libstdc++ diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index 5cc5f04adf67..c7cc30e53787 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -51,10 +51,9 @@ CLEANFILES+= unwind.h VERSION_MAP= ${.CURDIR}/Version.map +CXXFLAGS.clang+= -stdlib=libstdc++ .include <bsd.lib.mk> # Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98. CXXFLAGS:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]} - -CXXFLAGS.clang+= -stdlib=libstdc++ |