]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Added --disable-libssp to gcc.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Dec 2008 11:28:28 +0000 (12:28 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Dec 2008 11:28:28 +0000 (12:28 +0100)
lfs/gcc

diff --git a/lfs/gcc b/lfs/gcc
index 874e7461b78d951664a287a4ffcade232335a4d1..7b22d2bec33c235de21f132e6dd98a212df56c53 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -88,6 +88,10 @@ ifeq "$(PASS)" "1"
        cd $(DIR_APP) && sed 's/^\(#define CC1_SPEC.*\)\("\)$$/\1 %{fno-pic|fpic|fPIC:;:-fPIC}\2/' \
                -i gcc/config/i386/linux.h
 
+       # libssp has no use with new versions of Glibc. Glibc completely replaces all 
+       # functions in libssp, linking to libssp will cause conflicts with libc, so 
+       # libssp is a waste of space... so --disable-libssp. 
+
        cd $(DIR_SRC)/gcc-build && \
                CC="gcc -B/usr/bin/" \
                ../$(THISAPP)/configure \
@@ -101,12 +105,11 @@ ifeq "$(PASS)" "1"
                        --enable-languages=c \
                        --enable-shared \
                        --disable-nls \
+                       --disable-libssp \
                        --disable-werror \
                        $(CONFIGURE_ARGS)
 
-       # 'gcc_cv_libc_provides_ssp=yes' is added because without it GCC may want to
-       # use libssp if the host system's libc is unsupported:
-       cd $(DIR_SRC)/gcc-build && make gcc_cv_libc_provides_ssp=yes $(PARALLELISMFLAGS)
+       cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
        cd $(DIR_SRC)/gcc-build && make install
 
        ln -fvs gcc $(TOOLS_DIR)/bin/cc
@@ -160,6 +163,7 @@ ifeq "$(PASS)" "2"
                        --disable-libstdcxx-pch \
                        --disable-bootstrap \
                        --disable-werror \
+                       --disable-libssp \
                        --disable-nls \
                        $(CONFIGURE_ARGS)
        cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
@@ -193,7 +197,8 @@ ifeq "$(STAGE)" "base"
                        --enable-clocale=gnu \
                        --enable-languages=c,c++ \
                        --disable-bootstrap \
-                       --disable-werror
+                       --disable-werror \
+                       --disable-libssp
 
        cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
        cd $(DIR_SRC)/gcc-build && make install