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

[hvlinux.git] / stage0 / pkg / binutils

diff --git a/stage0/pkg/binutils b/stage0/pkg/binutils
index 922e22c..443714d 100644 (file)
--- a/stage0/pkg/binutils
+++ b/stage0/pkg/binutils
@@ -1,33 +1,36 @@
 #!/bin/bash
 
-export AR=ar
-export AS=as
-
-CONFIGURE_OPTS="\
-    --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} \
-    --with-lib-path=/tools/lib \
-    --disable-nls \
-    --enable-shared \
-    --disable-multilib \
-    ${CONFIGURE_OPTS}"
-
 hvconfig_pre()
 {
+    export AR=ar
+    export AS=as
+
+    CONFIGURE_OPTS="\
+        ${CONFIGURE_OPTS} \
+        --host=${CLFS_HOST} \
+        --target=${CLFS_TARGET} \
+        --with-sysroot=${CLFS} \
+        --with-lib-path=/tools/lib \
+        --disable-nls \
+        --enable-shared \
+        --disable-multilib"
+
     case "${HVL_TARGET}" in
         "x86_64")
             # This adds 64 bit support to Binutils.
            CONFIGURE_OPTS="${CONFIGURE_OPTS} --enable-64-bit-bfd"
            ;;
     esac
-
 }
 
-hvbuild()
+hvconfig_post()
 {
+    unset AR
+    unset AS
     ${HVMAKE} configure-host
-    ${HVMAKE}
-    ${HVMAKE} install
+}
+
+hvbuild_post()
+{
     cp -v ../${PACKAGE}/include/libiberty.h /tools/include
 }