From owner-svn-src-head@FreeBSD.ORG  Sun Apr 20 16:33:29 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 326815FD;
 Sun, 20 Apr 2014 16:33:29 +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 1EBCE1D49;
 Sun, 20 Apr 2014 16:33:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3KGXSGd028866;
 Sun, 20 Apr 2014 16:33:28 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3KGXSD2028865;
 Sun, 20 Apr 2014 16:33:28 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201404201633.s3KGXSD2028865@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 20 Apr 2014 16:33:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264697 - 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 16:33:29 -0000

Author: gjb
Date: Sun Apr 20 16:33:28 2014
New Revision: 264697
URL: http://svnweb.freebsd.org/changeset/base/264697

Log:
  When building the 'xdev' target when WITH_GCC=1 and
  WITHOUT_CLANG_IS_CC=1, it appears WITHOUT_CLANG=1 must
  also be set.
  
  While here, reorder the lines to put the WITH_* and
  WITHOUT_* entries on the same line.
  
  MFC After:	3 days
  X-MFC-With:	r264518
  Tested on:	stable/10@r264677
  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 14:58:14 2014	(r264696)
+++ head/release/arm/release.sh	Sun Apr 20 16:33:28 2014	(r264697)
@@ -98,8 +98,9 @@ main() {
 	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 \
-		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} WITH_GCC=1 \
+	eval chroot ${CHROOTDIR} make -C /usr/src \
+		WITHOUT_CLANG_IS_CC=1 WITHOUT_CLANG=1 WITH_GCC=1 \
+		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH}
 		${WORLD_FLAGS} xdev
 
 	# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints