Date: Sun, 11 May 2014 16:08:06 -0600 From: Warner Losh <imp@bsdimp.com> To: Dimitry Andric <dim@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r265895 - in head/gnu/lib: libstdc++ libsupc++ Message-ID: <ACB33E4C-AEB0-4323-9C53-6CF057225221@gmail.com> In-Reply-To: <201405112107.s4BL71LN090061@svn.freebsd.org> References: <201405112107.s4BL71LN090061@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On May 11, 2014, at 3:07 PM, Dimitry Andric <dim@FreeBSD.org> wrote: > Author: dim > Date: Sun May 11 21:07:00 2014 > New Revision: 265895 > URL: http://svnweb.freebsd.org/changeset/base/265895 > > Log: > 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. You must modify CXXFLAGS before you finalize them with the := assignment is the real issue here. I broke this when I converted the .if to CXXFLAGS.clang a couple of revisions back. Thanks for fixing it. > Modified: > head/gnu/lib/libstdc++/Makefile > head/gnu/lib/libsupc++/Makefile > > Modified: head/gnu/lib/libstdc++/Makefile > ============================================================================== > --- head/gnu/lib/libstdc++/Makefile Sun May 11 20:44:58 2014 (r265894) > +++ head/gnu/lib/libstdc++/Makefile Sun May 11 21:07:00 2014 (r265895) > @@ -632,9 +632,9 @@ ${VERSION_MAP}: ${SRCDIR}/config/abi/pre > > 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++ > > Modified: head/gnu/lib/libsupc++/Makefile > ============================================================================== > --- head/gnu/lib/libsupc++/Makefile Sun May 11 20:44:58 2014 (r265894) > +++ head/gnu/lib/libsupc++/Makefile Sun May 11 21:07:00 2014 (r265895) > @@ -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++ >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ACB33E4C-AEB0-4323-9C53-6CF057225221>