pakfire: use correct tree on x86_64.

[ipfire-2.x.git] / lfs / gcc

diff --git a/lfs/gcc b/lfs/gcc
index a9f124b8cee0a393baa355d5acec5d44fd53db51..ff8723a1e85dfe40d4b4715727bc0b172eb2fbe9 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -38,6 +38,9 @@ CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=476370
+CFLAGS += -fgnu89-inline
+
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
@@ -97,6 +100,9 @@ else
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
+
+  # Disable stack protection in toolchain.
+  CFLAGS += -fno-stack-protector
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -111,6 +117,11 @@ ifeq "$(MACHINE)" "i586"
                --with-tune=generic
 endif
 
+ifeq "$(MACHINE)" "x86_64"
+       EXTRA_CONFIG += \
+               --disable-multilib
+endif
+
 EXTRA_CONFIG += \
        --with-bugurl=http://bugtracker.ipfire.org \
        --disable-libunwind-exceptions \