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.
This commit is contained in:
parent
55298f0397
commit
eb941910ca
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=265895
@ -632,9 +632,9 @@ ${VERSION_MAP}: ${SRCDIR}/config/abi/pre/gnu.ver
|
|||||||
|
|
||||||
CLEANFILES+= ${VERSION_MAP}
|
CLEANFILES+= ${VERSION_MAP}
|
||||||
|
|
||||||
|
CXXFLAGS.clang+= -stdlib=libstdc++
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
|
||||||
# Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
|
# 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:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
|
||||||
|
|
||||||
CXXFLAGS.clang+= -stdlib=libstdc++
|
|
||||||
|
@ -51,10 +51,9 @@ CLEANFILES+= unwind.h
|
|||||||
|
|
||||||
VERSION_MAP= ${.CURDIR}/Version.map
|
VERSION_MAP= ${.CURDIR}/Version.map
|
||||||
|
|
||||||
|
CXXFLAGS.clang+= -stdlib=libstdc++
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
|
||||||
# Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
|
# 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:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
|
||||||
|
|
||||||
CXXFLAGS.clang+= -stdlib=libstdc++
|
|
||||||
|
Loading…
Reference in New Issue
Block a user