From owner-svn-src-head@FreeBSD.ORG Fri Nov 1 18:29:28 2013 Return-Path: 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 ESMTP id 1CEC8DBB; Fri, 1 Nov 2013 18:29:28 +0000 (UTC) (envelope-from luigi@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E4C132F30; Fri, 1 Nov 2013 18:29:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1ITRFg098297; Fri, 1 Nov 2013 18:29:27 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1ITRjm098296; Fri, 1 Nov 2013 18:29:27 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201311011829.rA1ITRjm098296@svn.freebsd.org> From: Luigi Rizzo Date: Fri, 1 Nov 2013 18:29:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257514 - head/release/picobsd/build 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.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 18:29:28 -0000 Author: luigi Date: Fri Nov 1 18:29:27 2013 New Revision: 257514 URL: http://svnweb.freebsd.org/changeset/base/257514 Log: small cleanup for building picobsd-head without CLANG. Note that svn 257268 gnu/usr.bin/binutils/ld/Makefile seems to break the "toolchain" target when building HEAD on RELENG_9, so until this is solved you may want to svn update -r 257267 gnu/usr.bin/binutils/ld/Makefile before building picobsd Modified: head/release/picobsd/build/picobsd Modified: head/release/picobsd/build/picobsd ============================================================================== --- head/release/picobsd/build/picobsd Fri Nov 1 17:39:59 2013 (r257513) +++ head/release/picobsd/build/picobsd Fri Nov 1 18:29:27 2013 (r257514) @@ -166,12 +166,6 @@ create_includes_and_libraries2() { # opt log "create_includes_and_libraries2() for ${SRC} $1" if [ ${OSVERSION} -ge 600000 ] ; then no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITHOUT_CDDL=1" - #no="$no -DWITHOUT_CLANG -DMALLOC_PRODUCTION" - # XXX 20131001 see if clang fixes the build - export WITHOUT_CLANG=YES - export WITHOUT_ICONV=YES - export WITH_GCC=YES - export WITH_GNUCXX=YES no="$no -DMALLOC_PRODUCTION" else no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R" @@ -981,15 +975,16 @@ set_build_parameters() { export MAKEOBJDIRPREFIX=${l_objtree} export TARGET_ARCH=${o_arch} TARGET=${o_arch} # XXX 20131001 see if CLANG fixes the build - # XXX export WITHOUT_CLANG_IS_CC=1 - export WITHOUT_CLANG=YES - export WITHOUT_ICONV=YES - export WITH_GCC=YES - export WITH_GNUCXX=YES + export WITHOUT_CLANG_IS_CC=yes + export WITH_GCC=yes + export WITH_GNUCXX=yes + export WITHOUT_CLANG=yes + export WITHOUT_ICONV=yes # XXX why change machine_arch ? #-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m` # export CWARNFLAGS="-Wextra -Wno-sign-compare -Wno-missing-field-initializers" + # XXX BINMAKE does not really exist anymore eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\"" [ "$BINMAKE" = "" ] && \ eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V SUB_MAKE`\""