d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r280179,r280180:

Browse Source 
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.
This commit is contained in:
bdrewery 2015-04-04 00:42:09 +00:00
parent e247370125
commit 44dfc90bcd
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.inc1
View File

@ -1574,6 +1574,10 @@ _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
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"

2
lib/atf/libatf-c++/Makefile
View File

@ -27,7 +27,7 @@
.include <bsd.init.mk>
LIB= atf-c++
LIB_CXX= atf-c++
PRIVATELIB= true
SHLIB_MAJOR= 2

7
share/mk/bsd.README
View File

@ -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.

9
share/mk/bsd.lib.mk
View File

@ -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"