From aee7bee5c3e5827149aad909d256f6c97957e9ae Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Fri, 16 May 2014 14:40:07 +0000 Subject: [PATCH] Fix building libstdc++ with clang Reviewed by: theraven --- gnu/lib/libstdc++/Makefile | 5 ++--- gnu/lib/libsupc++/Makefile | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index d19f9f3bb3ff..dffb5632c0e6 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -634,7 +634,6 @@ CLEANFILES+= ${VERSION_MAP} .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++ +CXXFLAGS+= -std=gnu++98 + diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index 5cc5f04adf67..a172a6ed08ac 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -54,7 +54,5 @@ VERSION_MAP= ${.CURDIR}/Version.map .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++ +CXXFLAGS+= -std=gnu++98