X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fpkg%2Fgcc;h=11a2837ef18569a5a5c479d7e9e19106f73e0b82;hb=f0d54c69a71d7d5cb32aa342ea38cba6aab9570f;hp=c6df1c70678fd4658c912a49e0c52c3b4a839a79;hpb=69ac3e7cf686f8e95e47a7ab89bc38796aace488;p=hvlinux.git

diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc
index c6df1c7..11a2837 100644
--- a/stage1/pkg/gcc
+++ b/stage1/pkg/gcc
@@ -1,26 +1,21 @@
 #!/bin/bash
 
-hvpatch()
+hvconfig_pre()
 {
-    # Manually applying patches if specified
-    if [ -n "${GCC_PATCHES}" ]; then
-        for p in ${GCC_PATCHES}; do
-            apply_patch ${PACKAGE}-${p}.patch ${PACKAGE}
-        done
-    fi
+    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++"
 
-    case "${HVL_TARGET}" in
-        "x86")
-            apply_patch ${PACKAGE}-specs-1.patch ${PACKAGE}
-            ;;
-        "x86_64")
-            apply_patch ${PACKAGE}-pure64_specs-1.patch ${PACKAGE}
-	    ;;
-    esac
-}
-
-configure_pre()
-{
     cd ${LFS_TMP}/${PACKAGE}
 
     # Change the StartFile Spec to point to the correct library location:
@@ -35,11 +30,11 @@ configure_pre()
         gcc/Makefile.in.orig > gcc/Makefile.in
 }
 
-configure_post()
+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\|ISL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::"\
         -i Makefile
 }