Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage2 / pkg / gcc

diff --git a/stage2/pkg/gcc b/stage2/pkg/gcc
index c1c28c3..f3b4e73 100644 (file)
--- a/stage2/pkg/gcc
+++ b/stage2/pkg/gcc
@@ -5,8 +5,7 @@ hvconfig_pre()
     export CC="gcc -Wl,-rpath-link,/lib -isystem /usr/include"
     export CXX="g++ -Wl,-rpath-link,/lib -isystem /usr/include"
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/lib \
         --enable-shared \
         --enable-threads=posix \
@@ -17,10 +16,6 @@ hvconfig_pre()
         --enable-languages=c,c++ \
         --disable-multilib \
         --disable-libstdcxx-pch"
-
-    # Applying a sed substitution that will suppress the installation of
-    # libiberty.a. We want to use the Binutils version of libiberty.a
-    sed -i 's/install_to_$(INSTALL_DEST) //' ${LFS_TMP}/${PACKAGE}/libiberty/Makefile.in
 }
 
 hvconfig_post()
@@ -31,6 +26,9 @@ hvconfig_post()
 
 hvbuild_post()
 {
+    # Install the libiberty header file that is needed by some packages:
+    cp -v ${SRC_DIR}/include/libiberty.h /usr/include
+
     ln -svf ../usr/bin/cpp /lib
     ln -svf gcc /usr/bin/cc
 }