X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fpkg%2Fgcc;h=06f70f51601b6b00214307896bf6e4226010dc65;hb=6890ab467c34bc0ae1fccf18a521c3cedfa442a2;hp=eccf48009f1581d59a50194c47e19e4b704dc1a3;hpb=0028eaa73ae0c3bd1dbf90c4bd508ae705bc386f;p=hvlinux.git

diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc
index eccf480..06f70f5 100644
--- a/stage1/pkg/gcc
+++ b/stage1/pkg/gcc
@@ -1,41 +1,21 @@
 #!/bin/bash
 
-CONFIGURE_OPTS="\
-    ${CONFIGURE_OPTS} \
-    --target=${CLFS_TARGET} \
-    --disable-multilib \
-    --with-local-prefix=/tools \
-    --libexecdir=/tools/lib \
-    --disable-nls \
-    --disable-libstdcxx-pch \
-    --enable-long-long \
-    --enable-c99 \
-    --enable-shared \
-    --enable-threads=posix \
-    --enable-__cxa_atexit \
-    --enable-languages=c,c++"
-
-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")
-            apply_patch ${PACKAGE}-specs-1.patch ${PACKAGE}
-            ;;
-        "x86_64")
-            apply_patch ${PACKAGE}-pure64_specs-1.patch ${PACKAGE}
-	    ;;
-    esac
-}
-
 hvconfig_pre()
 {
+    CONFIGURE_OPTS+=" \
+        --target=${CLFS_TARGET} \
+        --disable-multilib \
+        --with-local-prefix=/tools \
+        --libexecdir=/tools/lib \
+        --disable-nls \
+        --disable-libstdcxx-pch \
+        --enable-long-long \
+        --enable-c99 \
+        --enable-shared \
+        --enable-threads=posix \
+        --enable-__cxa_atexit \
+        --enable-languages=c,c++"
+
     cd ${LFS_TMP}/${PACKAGE}
 
     # Change the StartFile Spec to point to the correct library location:
@@ -54,7 +34,7 @@ hvconfig_post()
 {
     # Prevent GCC from looking in the wrong directories for headers and
     # libraries:
-    sed -e "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
+    sed -e "/^HOST_\(GMP\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
         -i Makefile
 }