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

diff --git a/stage2/pkg/binutils b/stage2/pkg/binutils
index c9522c1..f900800 100644
--- a/stage2/pkg/binutils
+++ b/stage2/pkg/binutils
@@ -5,23 +5,15 @@ hvconfig_pre()
     export CC="gcc -isystem /usr/include"
     export LDFLAGS="-Wl,-rpath-link,/lib"
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    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
 }
@@ -38,9 +30,3 @@ hvbuild()
     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
-}