From owner-svn-src-head@FreeBSD.ORG  Tue Apr  1 14:23:59 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 87F0A6A2;
 Tue,  1 Apr 2014 14:23:59 +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 74C39A38;
 Tue,  1 Apr 2014 14:23:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31ENx89014805;
 Tue, 1 Apr 2014 14:23:59 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31ENx5A014803;
 Tue, 1 Apr 2014 14:23:59 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404011423.s31ENx5A014803@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 1 Apr 2014 14:23:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263991 - in head: . gnu/lib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 14:23:59 -0000

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