svn commit: r318594 - in head: lib lib/libc++experimental tools/build/mk

[Konstantin Belousov]

On Sun, May 21, 2017 at 08:34:31PM +0200, Dimitry Andric wrote:
> On 21 May 2017, at 20:00, Konstantin Belousov <kostikbel at gmail.com> wrote:
> > 
> > On Sun, May 21, 2017 at 05:07:12PM +0000, Dimitry Andric wrote:
> >> Author: dim
> >> Date: Sun May 21 17:07:12 2017
> >> New Revision: 318594
> >> URL: https://svnweb.freebsd.org/changeset/base/318594
> >> 
> >> Log:
> >>  Add libc++experimental.a for std::experimental support
> >> 
> >>  This adds a separate library for supporting std::experimental features.
> >>  It is purposefully static, and must be explicitly linked into programs
> >>  using -lc++experimental.
> >> 
> >>  PLEASE NOTE: there is NO WARRANTY as to any stability or continuing
> >>  existence of the features in the std::experimental parts of the C++
> >>  library!
> >> 
> >>  Reviewed by:	ed
> >>  Differential Revision: https://reviews.freebsd.org/D10840
> >> 
> >> Added:
> >>  head/lib/libc++experimental/
> >>  head/lib/libc++experimental/Makefile   (contents, props changed)
> >> Modified:
> >>  head/lib/Makefile
> >>  head/tools/build/mk/OptionalObsoleteFiles.inc
> >> 
> >> Modified: head/lib/Makefile
> >> ==============================================================================
> >> --- head/lib/Makefile	Sun May 21 15:37:08 2017	(r318593)
> >> +++ head/lib/Makefile	Sun May 21 17:07:12 2017	(r318594)
> >> @@ -156,7 +156,7 @@ _libclang_rt=	libclang_rt
> >> 
> >> .if ${MK_LIBCPLUSPLUS} != "no"
> >> _libcxxrt=	libcxxrt
> >> -_libcplusplus=	libc++
> >> +_libcplusplus=	libc++ libc++experimental
> >> .endif
> >> 
> >> SUBDIR.${MK_EFI}+=	libefivar
> >> 
> >> Added: head/lib/libc++experimental/Makefile
> >> ==============================================================================
> >> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> >> +++ head/lib/libc++experimental/Makefile	Sun May 21 17:07:12 2017	(r318594)
> >> @@ -0,0 +1,29 @@
> >> +# $FreeBSD$
> >> +
> >> +.include <src.opts.mk>
> >> +
> >> +PACKAGE=	clibs
> >> +SRCDIR=		${SRCTOP}/contrib/libc++
> >> +
> >> +LIB=		c++experimental
> >> +NO_PIC=
> > I suspect for this case it is almost required to provide
> > libc++experimental_pic.a, otherwise linking the lib to dso would
> > cause textrel.
> 
> Hmm, I don't know how to tell the build system otherwise that I don't
> want any shared library.  It looks like NO_PIC is needed in bsd.lib.mk
> to force no .so to be built, though.
> 
> Maybe it is easier to just build the .a file with -fPIC always?  There
> is really no need for two .a files.

May be, indeed.