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

diff --git a/stage2/pkg/binutils b/stage2/pkg/binutils
index dabcf14..f0404e2 100644
--- a/stage2/pkg/binutils
+++ b/stage2/pkg/binutils
@@ -1,16 +1,15 @@
 #!/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
@@ -21,11 +20,17 @@ hvconfig_pre()
                 ${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