From a867da35e93ceb7ac9f8ad9b82f83bf2c6990636 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 23 Oct 2008 15:57:00 +0000 Subject: [PATCH] Stefan Fiedler: gcc: allow building only the C compiler in stage 1 and 2 [2008100412213823643] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9084 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/gcc/gcc.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/base/gcc/gcc.conf b/package/base/gcc/gcc.conf index 6e897d126..e8a477bfe 100644 --- a/package/base/gcc/gcc.conf +++ b/package/base/gcc/gcc.conf @@ -89,7 +89,7 @@ elif [ $stagelevel -eq 0 ] ; then configprefix="" confopt="--prefix=${CLFS}/$cross_tools \ --host=${CLFS_HOST} --target=${CLFS_TARGET} \$extraconfopt" - var_append extraconfopt " \ + var_append extraconfopt " " " \ --with-sysroot=${CLFS} --disable-nls --disable-shared \ --enable-languages=c" if [ $pkg_gcc_version -ge 43 ]; then @@ -103,9 +103,9 @@ elif [ $stagelevel -eq 1 ] ; then configprefix="" confopt="--prefix=${CLFS}/$cross_tools \ --host=${CLFS_HOST} --target=${CLFS_TARGET} \$extraconfopt" - var_append extraconfopt " \ + var_append extraconfopt " " " \ --with-sysroot=${CLFS} --disable-nls --enable-shared \ - --enable-languages=c,c++ --enable-__cxa_atexit \ + --enable-languages=\$languages --enable-__cxa_atexit \ --enable-c99 --enable-long-long --enable-threads=posix" makeopt="" makeinstopt="install" @@ -116,10 +116,10 @@ elif [ $stagelevel -ge 2 ] ; then --enable-c99 --enable-long-long --enable-threads=posix \ --enable-clocale=gnu" if [ $stagelevel -eq 2 ] ; then - var_append extraconfopt " " "--enable-languages=c,c++ \ + var_append extraconfopt " " "--enable-languages=\$languages \ --disable-libstdcxx-pch" else - var_append confopt ' ' '--enable-languages=$languages' + var_append extraconfopt ' ' '--enable-languages=$languages' x="ROCKCFG_PKG_GCC${pkg_gcc_version}_PROFILED" if [ "${!x}" = 1 ] ; then var_append makeopt ' ' "GCJFLAGS=\"\$CXXFLAGS\" \ @@ -193,8 +193,8 @@ custmain () { mkdir -v ../objdir ; cd ../objdir - eval echo $configprefix ../gcc-*/configure $confopt - eval $configprefix ../gcc-*/configure $confopt + eval echo $configprefix ../gcc-*/configure $( eval echo $confopt ) + eval $configprefix ../gcc-*/configure $( eval echo $confopt ) eval make $makeopt