X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpkg%2Fgcc;h=0fd67956487549297f413e653bc94d69ccba9962;hb=6890ab467c34bc0ae1fccf18a521c3cedfa442a2;hp=d0d37e4fdf2355684d53ba4f67f673d827d1dafe;hpb=f17ab848cb756cad27489bf0c2746e5ead466658;p=hvlinux.git

diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index d0d37e4..0fd6795 100644
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -6,8 +6,7 @@ hvconfig_pre()
     export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
 
     # Common options for passes 1 & 2
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --build=${CLFS_HOST} \
         --host=${CLFS_HOST} \
         --target=${CLFS_TARGET} \
@@ -16,13 +15,12 @@ hvconfig_pre()
         --disable-nls \
         --with-mpfr=/cross-tools \
         --with-gmp=/cross-tools \
-        --with-ppl=/cross-tools \
         --with-cloog=/cross-tools \
         --enable-cloog-backend=isl \
         --disable-multilib"
 
     if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
-        CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+        CONFIGURE_OPTS+=" \
             --disable-shared \
             --without-headers \
             --with-newlib \
@@ -32,8 +30,13 @@ hvconfig_pre()
             --disable-libssp \
             --disable-threads \
             --enable-languages=c"
+
+        # We will create a dummy limits.h so the build will not use the one
+        # provided by the host distro:
+        mkdir -p /tools/include
+        touch /tools/include/limits.h
     else
-        CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+        CONFIGURE_OPTS+=" \
             --enable-shared \
             --enable-languages=c,c++ \
             --enable-__cxa_atexit \
@@ -53,12 +56,6 @@ hvconfig_pre()
     # only:
     sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
         -i gcc/Makefile.in
-
-    if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
-        # We will create a dummy limits.h so the build will not use the one
-        # provided by the host distro:
-        touch /tools/include/limits.h
-    fi
 }
 
 hvconfig_post()