X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=e0cd10274d3ab5fb93870a71c670c59d60faa054;hb=e01b933cc28814d8650f829712639b4eb0d991e6;hp=d28fa852f9aa2789be9c07dc9e26427d06db4711;hpb=6e96dd142aa6a54f970968c8a1bb2087aa8c6147;p=ipfire-2.x.git

diff --git a/lfs/gcc b/lfs/gcc
index d28fa852f9..e0cd10274d 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -59,6 +59,10 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
 ifeq "$(PASS)" "1"
+  CFLAGS    := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
+  CXXFLAGS  := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CXXFLAGS))
+  CXXFLAGS  += -std=gnu++98
+
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
@@ -286,14 +290,15 @@ endif
 ifeq "$(ROOT)" ""
 	ln -svf ../usr/bin/cpp /lib
 	ln -svf gcc /usr/bin/cc
+	# remove gdb python files from libdir
+	rm -rf /usr/lib/*-gdb.py
 else
 ifeq    "$(PASS)" "1"
 	ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
-
-	# remove gdb python files from libdir
-	rm -rf /tools/lib/*-gdb.py
 else
 	ln -svf gcc /tools/bin/cc
+	# remove gdb python files from libdir
+	rm -rf /tools/lib/*-gdb.py
 endif
 endif
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build