From owner-svn-src-all@FreeBSD.ORG Thu Jul 10 21:11:49 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A30E4D2C; Thu, 10 Jul 2014 21:11:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84ED32579; Thu, 10 Jul 2014 21:11:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6ALBnIF018126; Thu, 10 Jul 2014 21:11:49 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6ALBmUf018122; Thu, 10 Jul 2014 21:11:48 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201407102111.s6ALBmUf018122@svn.freebsd.org> From: Warner Losh Date: Thu, 10 Jul 2014 21:11:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268508 - in head: . gnu/lib gnu/usr.bin/cc share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 21:11:49 -0000 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 @@ -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"