diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-04-04 00:42:09 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-04-04 00:42:09 +0000 |
| commit | 44dfc90bcd426f5f12c49e21eace0fe5d1edd2f0 (patch) | |
| tree | 4d580f376425f895285036aeae5ff7da4741e715 /Makefile.inc1 | |
| parent | e247370125655f0c959f224089b349eef7280c4c (diff) | |
| download | FreeBSD-src-44dfc90bcd426f5f12c49e21eace0fe5d1edd2f0.zip FreeBSD-src-44dfc90bcd426f5f12c49e21eace0fe5d1edd2f0.tar.gz | |
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.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index abb30b7..243f5f5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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" |
