From eb941910cad1a01601278802b7194937c15fff1f Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 11 May 2014 21:07:00 +0000 Subject: [PATCH] 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. --- gnu/lib/libstdc++/Makefile | 4 ++-- 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 # 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 # 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++