Date: Sun, 16 Feb 2014 07:45:11 -0500 From: Julio Merino <jmmv@outlook.com> To: Dimitry Andric <dim@FreeBSD.org> Cc: Garrett Cooper <yanegomi@gmail.com>, freebsd-testing@FreeBSD.org, David Chisnall <theraven@FreeBSD.org> Subject: Re: Compile error with gcc Message-ID: <BLU0-SMTP284F6428835416F4D9E3727C09E0@phx.gbl> In-Reply-To: <D10C2EBB-36EC-4292-A944-4356EA5657F2@FreeBSD.org> References: <695E42A3-2009-4DD7-B10E-BF8465C89D39@gmail.com> <A8EF2DCC-5F11-4405-88D1-05A193AB7BAF@gmail.com> <D10C2EBB-36EC-4292-A944-4356EA5657F2@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
On Feb 16, 2014, at 7:11, Dimitry Andric <dim@FreeBSD.org> wrote: > > I don't think this will always work correctly. If MK_LIBCPLUSPLUS is > defined in bsd.own.mk, it only means libc++ is being *built*, not that > it is being used. > > It is probably easier and more fool-proof to check if _LIBCPP_VERSION is > defined (which is the case when you use libc++) in bconfig.h, like so: > > Index: contrib/atf/bconfig.h > =================================================================== > --- contrib/atf/bconfig.h (revision 261974) > +++ contrib/atf/bconfig.h (working copy) > @@ -56,7 +56,9 @@ > #define HAVE_UNSETENV 1 > > /* Define to 1 if vsnprintf is in std */ > +#ifdef _LIBCPP_VERSION > #define HAVE_VSNPRINTF_IN_STD 1 > +#endif Let's not do that unless we can change configure.ac to generate these same contents. Maybe we can just revert this to _not_ define HAVE_VSNPRINTF_IN_STD as it used to be the case before the new import? Things were working just fine with both libstdc++ and libc++ even if that setting was not accurate for the latter...help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BLU0-SMTP284F6428835416F4D9E3727C09E0>