Date: Tue, 1 Apr 2014 14:23:59 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263991 - in head: . gnu/lib Message-ID: <201404011423.s31ENx5A014803@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Apr 1 14:23:58 2014 New Revision: 263991 URL: http://svnweb.freebsd.org/changeset/base/263991 Log: 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. Modified: head/Makefile.inc1 head/gnu/lib/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Apr 1 14:17:38 2014 (r263990) +++ head/Makefile.inc1 Tue Apr 1 14:23:58 2014 (r263991) @@ -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 Modified: head/gnu/lib/Makefile ============================================================================== --- head/gnu/lib/Makefile Tue Apr 1 14:17:38 2014 (r263990) +++ head/gnu/lib/Makefile Tue Apr 1 14:23:58 2014 (r263991) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404011423.s31ENx5A014803>