X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fbinutils;h=f9008004b363a0fe04dce08874041b1c1020111d;hb=2121ae9154ff063eef0defe0a9208663062a2d01;hp=dabcf149e2a57aff0a2583500bc4dfd9e6adbab0;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git

diff --git a/stage2/pkg/binutils b/stage2/pkg/binutils
index dabcf14..f900800 100644
--- a/stage2/pkg/binutils
+++ b/stage2/pkg/binutils
@@ -1,40 +1,32 @@
 #!/bin/bash
 
-CC="gcc -isystem /usr/include"
-LDFLAGS="-Wl,-rpath-link,/lib"
-
-CONFIGURE_OPTS="\
-    --libdir=/usr/lib \
-    --enable-shared \
-    --disable-multilib \
-    ${CONFIGURE_OPTS}"
-
 hvconfig_pre()
 {
+    export CC="gcc -isystem /usr/include"
+    export LDFLAGS="-Wl,-rpath-link,/lib"
+
+    CONFIGURE_OPTS+=" \
+        --libdir=/usr/lib \
+        --enable-shared \
+        --disable-multilib"
+
     case "${HVL_TARGET}" in
         "x86_64")
-            # Libiberty uses gcc -print-multi-os-directory to determine where to
-            # install libiberty.a. Because our temporary GCC is still
-            # multilib-aware, the command returns ../lib64 which causes the archive
-            # to be installed into /usr/lib64. The following sed will prevent this:
-            sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' \
-                ${LFS_TMP}/${PACKAGE}/libiberty/Makefile.in
-
             # This adds 64 bit support to Binutils.
-	    CONFIGURE_OPTS="${CONFIGURE_OPTS} --enable-64-bit-bfd"
+	    CONFIGURE_OPTS+=" --enable-64-bit-bfd"
 	    ;;
     esac
 }
 
+hvconfig_post()
+{
+    unset CC
+    unset LDFLAGS
+}
+
 hvbuild()
 {
     make configure-host
     make tooldir=/usr
     make tooldir=/usr install
 }
-
-hvbuild_post()
-{
-    # Install the libiberty header file that is needed by some packages:
-    cp -v ../${PACKAGE}/include/libiberty.h /usr/include
-}