X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpkg%2Fbinutils;h=5a057a100342160dffdf98faf47153846f160a2b;hb=b6f8c455b6b970c08eab79303c95acbc1506f61d;hp=922e22c18dc3d7dee0933969123be5b568073914;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git

diff --git a/stage0/pkg/binutils b/stage0/pkg/binutils
index 922e22c..5a057a1 100644
--- a/stage0/pkg/binutils
+++ b/stage0/pkg/binutils
@@ -1,33 +1,39 @@
 #!/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
+
+    # --with-lib-path:
+    # Set to dummy (non-existent) directory to prevent having
+    # host directories list.
+    CONFIGURE_OPTS=" \
+        --prefix=/cross-tools \
+        --host=${CLFS_HOST} \
+        --target=${CLFS_TARGET} \
+        --with-sysroot=${CLFS} \
+        --with-lib-path=${CLFS}/dummy-directory/ \
+        --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
-    cp -v ../${PACKAGE}/include/libiberty.h /tools/include
 }