binutils/gcc: Explicitely declare host and build architecture tuple

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

diff --git a/lfs/gcc b/lfs/gcc
index 02c33ba5100ac4b66a4c69979a13ecfc74dc5615..f9502562dca0e8131d88feae8a98b5c01f10c4dd 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -83,8 +83,10 @@ ifeq "$(PASS)" "1"
        --with-sysroot=$(ROOT) \
        --with-local-prefix=$(TOOLS_DIR) \
        --with-native-system-header-dir=$(TOOLS_DIR)/include \
+       --with-glibc-version=2.11 \
        --disable-nls \
        --disable-shared \
+       --disable-multilib \
        --disable-decimal-float \
        --disable-threads \
        --disable-libatomic \
@@ -115,11 +117,13 @@ ifeq "$(PASS)" "2"
        RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
        --build=$(BUILDTARGET) \
+       --host=$(BUILDTARGET) \
        --prefix=$(TOOLS_DIR) \
        --with-local-prefix=$(TOOLS_DIR) \
        --with-native-system-header-dir=$(TOOLS_DIR)/include \
        --enable-languages=c,c++ \
        --disable-libstdcxx-pch \
+       --disable-multilib \
        --disable-libgomp
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
@@ -163,17 +167,11 @@ endif
 
 ifeq "$(BUILD_ARCH)" "armv6l"
        EXTRA_CONFIG += \
-               --with-arch=armv6 \
+               --with-arch=armv6zk+fp \
                --with-float=softfp
 #              --disable-sjlj-exceptions
 endif
 
-ifeq "$(BUILD_ARCH)" "i586"
-       EXTRA_CONFIG += \
-               --with-arch=i586 \
-               --with-tune=generic
-endif
-
 ifeq "$(BUILD_ARCH)" "riscv64"
        EXTRA_CONFIG += \
                --with-arch=rv64gc \
@@ -236,6 +234,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc.git-745dae5-remove_cyclades.patch
+
+
        @mkdir $(DIR_SRC)/gcc-build
 
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
@@ -285,7 +287,7 @@ else
                $(EXTRA_ENV) \
                $(DIR_APP)/configure \
                        $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE)
+       cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE) $(MAKETUNING)
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
 endif