svn commit: r281056 - in stable/10: . lib/atf/libatf-c++ share/mk

[Bryan Drewery]

Author: bdrewery
Date: Sat Apr  4 00:42:09 2015
New Revision: 281056
URL: https://svnweb.freebsd.org/changeset/base/281056

Log:
  MFC r280179,r280180:
  
    r280179:
      Add LIB_CXX so that C++ libraries will use CXX to link.
  
      This adds some extra dependencies directly to Makefile.inc1 as
      atf is still a prebuild library in stable/10. If r273449 is MFCd
      these can come out.
  
    r280180:
      Document LIB and LIB_CXX.

Modified:
  stable/10/Makefile.inc1
  stable/10/lib/atf/libatf-c++/Makefile
  stable/10/share/mk/bsd.README
  stable/10/share/mk/bsd.lib.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Sat Apr  4 00:31:40 2015	(r281055)
+++ stable/10/Makefile.inc1	Sat Apr  4 00:42:09 2015	(r281056)
@@ -1574,6 +1574,10 @@ _prebuild_libs+= gnu/lib/libstdc++ gnu/l
 gnu/lib/libstdc++__L: lib/msun__L
 .endif
 
+.if ${MK_LIBCPLUSPLUS} != "no"
+_prebuild_libs+= lib/libc++
+.endif
+
 lib/libgeom__L: lib/libexpat__L
 
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
@@ -1583,6 +1587,12 @@ lib/libgeom__L: lib/libexpat__L
 MAKE+=		-DWITH_ATF
 .endif
 _lib_atf=	lib/atf
+.if ${MK_GNUCXX} != no
+lib/atf__L: gnu/lib/libstdc++__L
+.endif
+.if ${MK_LIBCPLUSPLUS} != "no"
+lib/atf__L: lib/libc++__L lib/msun__L
+.endif
 .endif
 
 .if ${MK_LIBTHR} != "no"

Modified: stable/10/lib/atf/libatf-c++/Makefile
==============================================================================
--- stable/10/lib/atf/libatf-c++/Makefile	Sat Apr  4 00:31:40 2015	(r281055)
+++ stable/10/lib/atf/libatf-c++/Makefile	Sat Apr  4 00:42:09 2015	(r281056)
@@ -27,7 +27,7 @@
 
 .include <bsd.init.mk>
 
-LIB=		atf-c++
+LIB_CXX=	atf-c++
 PRIVATELIB=	true
 SHLIB_MAJOR=	2
 

Modified: stable/10/share/mk/bsd.README
==============================================================================
--- stable/10/share/mk/bsd.README	Sat Apr  4 00:31:40 2015	(r281055)
+++ stable/10/share/mk/bsd.README	Sat Apr  4 00:42:09 2015	(r281056)
@@ -334,6 +334,13 @@ with the current needs of the BSD tree.
 
 It sets/uses the following variables:
 
+LIB		The name of the library to build.
+
+LIB_CXX		The name of the library to build. It also causes
+		<bsd.lib.mk> to link the library with the
+		standard C++ library.  LIB_CXX overrides the value
+		of LIB if LIB is also set.
+
 LIBDIR		Target directory for libraries.
 
 LINTLIBDIR	Target directory for lint libraries.

Modified: stable/10/share/mk/bsd.lib.mk
==============================================================================
--- stable/10/share/mk/bsd.lib.mk	Sat Apr  4 00:31:40 2015	(r281055)
+++ stable/10/share/mk/bsd.lib.mk	Sat Apr  4 00:42:09 2015	(r281056)
@@ -4,6 +4,13 @@
 
 .include <bsd.init.mk>
 
+.if defined(LIB_CXX)
+LIB=	${LIB_CXX}
+_LD=	${CXX}
+.else
+_LD=	${CC}
+.endif
+
 # Set up the variables controlling shared libraries.  After this section,
 # SHLIB_NAME will be defined only if we are to create a shared library.
 # SHLIB_LINK will be defined only if we are to create a link to it.
@@ -208,7 +215,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
 .if defined(SHLIB_LINK)
 	@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
 .endif
-	${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+	${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
 .if ${MK_CTF} != "no"