Completed transition to new ipkg method (ipkg.def), successfully booting after stage 1

[hvlinux.git] / stage0 / pkg / gcc

diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index 423b932..433e601 100644 (file)
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-AR=ar
-LDFLAGS="-Wl,-rpath,/cross-tools/lib"
-
 hvpatch()
 {
     # Manually applying patches if specified
@@ -24,8 +21,12 @@ hvpatch()
 
 hvconfig_pre()
 {
+    export AR=ar
+    export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
+
     # Common options for passes 1 & 2
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS="\
+        ${CONFIGURE_OPTS} \
         --build=${CLFS_HOST} \
         --host=${CLFS_HOST} \
         --target=${CLFS_TARGET} \
@@ -33,7 +34,10 @@ hvconfig_pre()
         --with-local-prefix=/tools \
         --disable-nls \
         --with-mpfr=/cross-tools \
-        --with-gmp=/cross-tools"
+        --with-gmp=/cross-tools \
+        --with-ppl=/cross-tools \
+        --with-cloog=/cross-tools \
+        --disable-multilib"
 
     if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
         CONFIGURE_OPTS="${CONFIGURE_OPTS} \
@@ -56,14 +60,6 @@ hvconfig_pre()
             --enable-threads=posix"
     fi
 
-    case "${HVL_TARGET}" in
-        *)
-            CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-ppl=/cross-tools \
-            --with-cloog=/cross-tools \
-            --disable-multilib"
-            ;;
-    esac
-
     cd ${LFS_TMP}/${PACKAGE}
 
     # Change the StartFile Spec to point to the correct library location:
@@ -83,6 +79,12 @@ hvconfig_pre()
     fi
 }
 
+hvconfig_post()
+{
+    unset AR
+    unset LDFLAGS
+}
+
 hvbuild()
 {
     if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then