From c77d0c982c7f0e7939fac4d3670439f4568d26ee Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 1 Apr 2014 14:23:58 +0000 Subject: [PATCH] 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. --- Makefile.inc1 | 2 +- gnu/lib/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 01077d5dcee8..4a49d1020a41 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 50797fced309..61ea14bf122c 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