X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpkg%2Fbinutils;h=60778447e00fd53a4a172706feec1471ecb7336f;hb=c40cf9db268db61676c4e239314317e74fdbf87c;hp=209859b1ea12475b5df1d786308255c477335388;hpb=69ac3e7cf686f8e95e47a7ab89bc38796aace488;p=hvlinux.git

diff --git a/stage0/pkg/binutils b/stage0/pkg/binutils
index 209859b..6077844 100644
--- a/stage0/pkg/binutils
+++ b/stage0/pkg/binutils
@@ -1,20 +1,40 @@
 #!/bin/bash
 
-configure_pre()
+hvconfig_pre()
 {
+    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"
+
+    # --enable-64-bit-bfd:
+    # bfd = Binary File Descriptor
+    # Include support for 64 bit targets. This is automatically turned on if
+    # you explicitly request a 64 bit target, but not for --enable-targets=all.
+    # If compiling on a 32-bit machine, this option forces to generate a
+    # compiler that can also emit 64-bit code.
     case "${HVL_TARGET}" in
-        "x86_64")
-            # This adds 64 bit support to Binutils.
-	    CONFIGURE_OPTS="${CONFIGURE_OPTS} --enable-64-bit-bfd"
-	    ;;
+        x86_64*)
+            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
 }