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`\""
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
