]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
gcc: Perform full bootstrap on ARM32
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 Apr 2017 18:31:37 +0000 (19:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 11:05:20 +0000 (12:05 +0100)
The build fails with various reasons and a full bootstrap
always succeeds. This takes a very long time so we try to
avoid it where ever possible.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/gcc

diff --git a/lfs/gcc b/lfs/gcc
index 6638ba07ea58196b2ccffd06e9d260a8c8c3952a..fc951764044069303dd91f17d184ec07470230b2 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -41,6 +41,14 @@ CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 CXXFLAGS  := $(CFLAGS)
 
+ifeq "$(BUILD_ARCH)" "armv7hl"
+       FULL_BOOTSTRAP = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+       FULL_BOOTSTRAP = 1
+endif
+
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
@@ -109,9 +117,15 @@ ifeq "$(PASS)" "2"
        --enable-__cxa_atexit \
        --enable-languages=c,c++ \
        --disable-libstdcxx-pch \
-       --disable-bootstrap
+       --disable-libgomp
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
+
+  ifeq "$(FULL_BOOTSTRAP)" "1"
+       EXTRA_CONFIG += --enable-bootstrap
+  else
+       EXTRA_CONFIG += --disable-bootstrap
+  endif
 else
   # PASS=L # libstdc++-v3
   TARGET = $(DIR_INFO)/$(THISAPP)-libstdc++