X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fgcc;h=f3b4e73a41545dd3a9d200a8e9220321c02a6b32;hb=1b3f334af67c84997f7b5e6dee56faf556f0ea4b;hp=75add255c77ad4deaf8c2d5261428da2c9e25671;hpb=412b89d97179a9911e948d19ee7ea1742266dd4f;p=hvlinux.git

diff --git a/stage2/pkg/gcc b/stage2/pkg/gcc
index 75add25..f3b4e73 100644
--- 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,27 +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
-}
-
-hvpatch()
-{
-    # Manually applying patches if specified
-    if [ -n "${GCC_PATCHES}" ]; then
-        for p in ${GCC_PATCHES}; do
-            apply_patch ${PACKAGE}-${p}.patch ${PACKAGE}
-        done
-    fi
-
-    case "${HVL_TARGET}" in
-        "x86_64")
-            # Apply the following patch so that GCC links to /lib instead of /lib64:
-            apply_patch ${PACKAGE}-pure64-1.patch ${PACKAGE}
-	    ;;
-    esac
 }
 
 hvconfig_post()
@@ -48,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
 }