svn commit: r268508 - in head: . gnu/lib gnu/usr.bin/cc share/mk

[Warner Losh]

Author: imp
Date: Thu Jul 10 21:11:48 2014
New Revision: 268508
URL: http://svnweb.freebsd.org/changeset/base/268508

Log:
  Make MK_GNUCXX mean "build the libstdc++ and libsupc++ libraries" and
  nothing more. Force it to be "no" when MK_CXX is "no" to simplify
  usage.  It no longer also means "build g++" since we no longer have a
  platform where that's interesting now that pc98 no longer needs clang
  and gcc, but not g++. pc98 now just uses clang after boot2 changes.

Modified:
  head/Makefile.inc1
  head/gnu/lib/Makefile
  head/gnu/usr.bin/cc/Makefile
  head/share/mk/src.opts.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jul 10 21:05:45 2014	(r268507)
+++ head/Makefile.inc1	Thu Jul 10 21:11:48 2014	(r268508)
@@ -1494,7 +1494,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" && ${MK_CXX} != "no"
+.if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
 .endif

Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile	Thu Jul 10 21:05:45 2014	(r268507)
+++ head/gnu/lib/Makefile	Thu Jul 10 21:11:48 2014	(r268508)
@@ -14,7 +14,7 @@ SUBDIR+= tests
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
-.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"
+.if ${MK_GNUCXX} != "no"
 SUBDIR+= libstdc++ libsupc++
 .endif
 

Modified: head/gnu/usr.bin/cc/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/Makefile	Thu Jul 10 21:05:45 2014	(r268507)
+++ head/gnu/usr.bin/cc/Makefile	Thu Jul 10 21:11:48 2014	(r268508)
@@ -12,12 +12,7 @@ SUBDIR+= cpp
 .endif
 
 .if ${MK_CXX} != "no"
-.if ${MK_GNUCXX} != "no"
-SUBDIR+= cc1plus c++ 
-.endif
-# This should be moved into the above block once c++filt from elftoolchain or
-# similar is provided.
-SUBDIR+= c++filt
+SUBDIR+= cc1plus c++ c++filt
 .endif
 
 .if ${MK_GCOV} != "no"

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Thu Jul 10 21:05:45 2014	(r268507)
+++ head/share/mk/src.opts.mk	Thu Jul 10 21:11:48 2014	(r268508)
@@ -205,11 +205,11 @@ __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL C
 .if ${__T} == "amd64" || ${__T} == "arm" || ${__T} == "armv6" || \
     ${__T} == "armv6hf" || ${__T} == "i386"
 __DEFAULT_YES_OPTIONS+=CLANG_IS_CC
-__DEFAULT_NO_OPTIONS+=GNUCXX GCC GCC_BOOTSTRAP
+__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
 .else
 # If clang is not cc, then build gcc by default
 __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP
-__DEFAULT_YES_OPTIONS+=GCC GNUCXX GCC_BOOTSTRAP
+__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
 .endif
 
 .include <bsd.mkopt.mk>
@@ -269,6 +269,7 @@ MK_KERBEROS:=	no
 .if ${MK_CXX} == "no"
 MK_CLANG:=	no
 MK_GROFF:=	no
+MK_GNUCXX:=	no
 .endif
 
 .if ${MK_MAIL} == "no"