X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpkg%2Fgcc;h=70f69c7052da61a339dd05417dc146494f1e21d7;hb=6ef29aea0134cb6e7e3f34233495b4d68818668f;hp=ed373acf412bcefc82303472893328a2c517a4d0;hpb=d9ee6b9ce4580bd0bff4ba9618333e63018a5556;p=hvlinux.git

diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index ed373ac..70f69c7 100644
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -3,7 +3,7 @@
 hvconfig_pre()
 {
     export AR=ar
-    export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
+    export LDFLAGS="-Wl,-rpath,${CROSS_TOOLS_DIR}/lib"
 
     # Common options for passes 1 & 2
     # --with-local-prefix:
@@ -19,19 +19,20 @@ hvconfig_pre()
     #     --with-native-system-header-dir=/tools/include
     #   then GCC will search for system headers in:
     #     /opt/toolchain/tools/include
-    CONFIGURE_OPTS+=" \
+    CONFIGURE_OPTS=" \
+        --prefix=/cross-tools \
         --build=${CLFS_HOST} \
         --host=${CLFS_HOST} \
         --target=${CLFS_TARGET} \
         --with-sysroot=${CLFS} \
-        --with-local-prefix=/tools \
+        --with-local-prefix=${TOOLS_DIR} \
         --with-native-system-header-dir=/tools/include \
         --disable-nls \
-        --with-mpfr=/cross-tools \
-        --with-gmp=/cross-tools \
-        --with-isl=/cross-tools \
-        --with-cloog=/cross-tools \
-        --with-mpc=/cross-tools
+        --with-mpfr=${CROSS_TOOLS_DIR} \
+        --with-gmp=${CROSS_TOOLS_DIR} \
+        --with-isl=${CROSS_TOOLS_DIR} \
+        --with-cloog=${CROSS_TOOLS_DIR} \
+        --with-mpc=${CROSS_TOOLS_DIR}
         --with-system-zlib \
         --enable-checking=release \
         --disable-multilib"
@@ -61,8 +62,8 @@ hvconfig_pre()
 
         # 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
+        mkdir -p ${TOOLS_DIR}/include
+        touch ${TOOLS_DIR}/include/limits.h
     else
         CONFIGURE_OPTS+=" \
             --enable-shared \
@@ -97,11 +98,11 @@ hvbuild()
 {
     if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
         ${HVMAKE} all-gcc all-target-libgcc
-        ${HVMAKE} install-gcc install-target-libgcc
+        ${HVMAKE} install-gcc install-target-libgcc DESTDIR=${CLFS}
     else
         ${HVMAKE} \
             AS_FOR_TARGET="${CLFS_TARGET}-as" \
             LD_FOR_TARGET="${CLFS_TARGET}-ld"
-        ${HVMAKE} install
+        ${HVMAKE} install DESTDIR=${CLFS}
     fi
 }