build: some changes for 11-CURRENT

build/base.sh

@@ -34,7 +34,7 @@ rm -rf ${SETSDIR}/base.txz
 
 git_clear ${SRCDIR}
 
-MAKEARGS="SRCCONF=${TOOLSDIR}/config/current/src.conf __MAKE_CONF="
+MAKEARGS="SRCCONF=${TOOLSDIR}/config/current/src.conf COMPILER_TYPE=clang __MAKE_CONF="
 
 make -C${SRCDIR} -j${CPUS} buildworld ${MAKEARGS} NO_CLEAN=yes
 make -C${SRCDIR}/release obj ${MAKEARGS}

build/ports.sh

@@ -29,6 +29,9 @@ set -e
 
 . ./common.sh
 
+# unbreaks gettext-runtime
+unset STAGEDIR
+
 cp ${TOOLSDIR}/config/current/make.conf /etc/make.conf
 
 PORT_LIST="${TOOLSDIR}/config/current/ports"

config/current/src.conf

@@ -7,7 +7,6 @@ WITHOUT_BLUETOOTH=1
 WITHOUT_CALENDAR=1
 WITHOUT_CLANG_EXTRAS=1
 WITHOUT_CLANG_FULL=1
-WITHOUT_CROSS_COMPILER=1
 WITHOUT_CVS=1
 WITHOUT_DEBUG_FILES=1
 WITHOUT_DICT=1
@@ -49,4 +48,5 @@ WITHOUT_SHAREDOCS=1
 WITHOUT_SVN=1
 WITHOUT_SVNLITE=1
 WITHOUT_SYSINSTALL=1
+WITHOUT_TESTS=1
 WITHOUT_VINUM=1