X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fcis-gcc;h=ae99b97814f86fed6a61f6837d6d7a636eb9fa48;hb=d285862d69e7fd12b359fbdb594a9d78607ece1f;hp=445bc890ac038fe9176988f49a40b8ea29e417f9;hpb=97b938a7a341fe0d45ba4f93ce9e785b2bdc182a;p=hvlinux.git

diff --git a/stage1/cis-gcc b/stage1/cis-gcc
index 445bc89..ae99b97 100755
--- a/stage1/cis-gcc
+++ b/stage1/cis-gcc
@@ -6,8 +6,12 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-# Manually applying patches
-apply_patch ${1}-branch_update-1.patch ${1}
+# Manually applying patches if specified
+if [ -n "${GCC_PATCHES}" ]; then
+    for p in ${GCC_PATCHES}; do
+        apply_patch ${1}-${p}.patch ${1}
+    done
+fi
 
 case "${HVL_TARGET}" in
     "x86")
@@ -60,9 +64,8 @@ CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
     --enable-__cxa_atexit \
     --enable-languages=c,c++
 # Prevent GCC from looking in the wrong directories for headers and libraries:
-cp Makefile{,.orig}
-sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
-    Makefile.orig > Makefile
+sed -e "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
+    -i Makefile
 ${HVMAKE} AS_FOR_TARGET="${AS}" LD_FOR_TARGET="${LD}"
 ${HVMAKE} install