toolchain: GCC improvements.

Harden gcc-static and create all gccs with our target.

diff --git a/pkgs/toolchain/gcc-static/gcc-static.nm b/pkgs/toolchain/gcc-static/gcc-static.nm
index 1beab0b3b5100c8811ad634720d5c8e08145c858..6683204d138d45aa1c737804738725580c94fb8f 100644 (file)
--- a/pkgs/toolchain/gcc-static/gcc-static.nm
+++ b/pkgs/toolchain/gcc-static/gcc-static.nm
@@ -33,6 +33,7 @@ define STAGE_BUILD
                        --target=$(TARGET) \
                        $(CONFIG_CPU) \
                        --prefix=$(TOOLS_DIR) \
+                       --libexecdir=$(TOOLS_DIR)/lib \
                        --disable-decimal-float \
                        --disable-libgomp \
                        --disable-libmudflap \
@@ -42,9 +43,10 @@ define STAGE_BUILD
                        --disable-multilib \
                        --disable-shared \
                        --disable-nls \
+                       --enable-espf \
                        $(CONFIGURE_ARGS)
 
-       cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
+       cd $(DIR_SRC)/gcc-build && make #$(PARALLELISMFLAGS)
 endef
 
 define STAGE_INSTALL

diff --git a/pkgs/toolchain/gcc/gcc.nm b/pkgs/toolchain/gcc/gcc.nm
index 01de9e39df184776dad62f766dc5479adeb7c915..3fda3d7f10d0534cb9e162b8a793c1cd71fe3c29 100644 (file)
--- a/pkgs/toolchain/gcc/gcc.nm
+++ b/pkgs/toolchain/gcc/gcc.nm
@@ -23,7 +23,10 @@ define STAGE_BUILD
                CC="$(TARGET)-gcc -B$(TOOLS_DIR)/lib/" \
                RANLIB=$(TARGET)-ranlib \
                ../$(THISAPP)/configure \
+                       --host=$(TARGET) \
+                       --build=$(TARGET) \
                        --prefix=$(TOOLS_DIR) \
+                       --libexecdir=$(TOOLS_DIR)/lib \
                        --with-local-prefix=$(TOOLS_DIR) \
                        --enable-clocale=gnu \
                        --enable-shared \
@@ -32,11 +35,12 @@ define STAGE_BUILD
                        --enable-languages=c,c++ \
                        --disable-libstdcxx-pch \
                        --disable-multilib \
+                       --disable-libssp \
                        --enable-espf \
                        \
                        $(CONFIG_CPU)
 
-       cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
+       cd $(DIR_SRC)/gcc-build && make #$(PARALLELISMFLAGS)
 endef
 
 define STAGE_INSTALL