diff options
author | imp <imp@FreeBSD.org> | 2014-04-01 14:23:58 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-04-01 14:23:58 +0000 |
commit | 385f24f997c518abe1a90c732c61a9cf535b904b (patch) | |
tree | e38654cc78cfac5a4172f854dfcfe0306e1be830 | |
parent | d527a1257e25c62615765eb163d1ca789dce5e7c (diff) | |
download | FreeBSD-src-385f24f997c518abe1a90c732c61a9cf535b904b.zip FreeBSD-src-385f24f997c518abe1a90c732c61a9cf535b904b.tar.gz |
It is possible that MK_GNUCXX is "yes" but MK_CXX is "no" so make sure
MK_CXX isn't "no" before building these libraries.
-rw-r--r-- | Makefile.inc1 | 2 | ||||
-rw-r--r-- | gnu/lib/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 01077d5..4a49d10 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1486,7 +1486,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} -.if ${MK_GNUCXX} != no +.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ .endif diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 50797fc..61ea14b 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -10,7 +10,7 @@ SUBDIR+= libssp # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. -.if ${MK_GNUCXX} != "no" +.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no" SUBDIR+= libstdc++ libsupc++ .endif |