From owner-svn-src-head@FreeBSD.ORG  Sun Apr 20 20:46:07 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 53559AA0;
 Sun, 20 Apr 2014 20:46:07 +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 40BEC133A;
 Sun, 20 Apr 2014 20:46:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3KKk78o033198;
 Sun, 20 Apr 2014 20:46:07 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3KKk7Vp033197;
 Sun, 20 Apr 2014 20:46:07 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201404202046.s3KKk7Vp033197@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 20 Apr 2014 20:46:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264703 - head/release/arm
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: Sun, 20 Apr 2014 20:46:07 -0000

Author: gjb
Date: Sun Apr 20 20:46:06 2014
New Revision: 264703
URL: http://svnweb.freebsd.org/changeset/base/264703

Log:
  Apply a slightly different color hammer to arm/release.sh:
  
   - gcc(1) fails to build usr.bin/dtc
   - lack of WITH_GNUCXX=1 causes cc1plus(1) calls to fail
   - u-boot fails to build with clang (hard-coded gcc(1) calls)
  
  Implement the proper incantation of WITH_/WITHOUT_ knobs
  to get arm snapshot builds working again.
  
  Since the cc(1) binary is no longer expected to be clang(1),
  remove the chroot(8) post-install cc(1) overwrite.
  
  MFC After:	3 days
  X-MFC-With:	r264518,r264697,r264698
  Tested on:	stable/10@r264677 RPI-B
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/arm/release.sh

Modified: head/release/arm/release.sh
==============================================================================
--- head/release/arm/release.sh	Sun Apr 20 18:21:05 2014	(r264702)
+++ head/release/arm/release.sh	Sun Apr 20 20:46:06 2014	(r264703)
@@ -92,14 +92,9 @@ install_uboot() {
 }
 
 main() {
-	# Build gcc for use in the chroot for arm builds.
-	# This is not '-j'-safe, so force '-j1' to allow using
-	# additional, non-'-j' options specified in WORLD_FLAGS.
-	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
-		WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
 	# Build the 'xdev' target for crochet.
 	eval chroot ${CHROOTDIR} make -C /usr/src \
-		WITHOUT_CLANG_IS_CC=1 WITHOUT_CLANG=1 WITH_GCC=1 \
+		WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \
 		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
 		${WORLD_FLAGS} xdev