toolchain: filter -mfpu from CFLAGS for first pass

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

diff --git a/lfs/gcc b/lfs/gcc
index e898d6a8fe6048831129865e40288b235ad78feb..9325792ffe944e53e3cd96713b61cf337a82b1ac 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -36,11 +36,20 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mfpu=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
 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)" ""
@@ -73,6 +82,7 @@ ifeq "$(PASS)" "1"
        --disable-libatomic \
        --disable-libmudflap \
        --disable-libssp \
+       --disable-libmpx \
        --disable-libgomp \
        --disable-libquadmath \
        --disable-libstdc++-v3 \
@@ -96,21 +106,21 @@ ifeq "$(PASS)" "2"
        AR="$(CROSSTARGET)-ar" \
        RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
-       --host=$(BUILDTARGET) \
        --build=$(BUILDTARGET) \
-       --target=$(BUILDTARGET) \
        --prefix=/tools \
        --with-local-prefix=/tools \
        --with-native-system-header-dir=/tools/include \
-       --enable-clocale=gnu \
-       --enable-shared \
-       --enable-threads=posix \
-       --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++
@@ -150,12 +160,8 @@ ifeq "$(BUILD_ARCH)" "i586"
                --with-tune=generic
 endif
 
-ifeq "$(BUILD_ARCH)" "x86_64"
-       EXTRA_CONFIG += \
-               --disable-multilib
-endif
-
 EXTRA_CONFIG += \
+       --disable-multilib \
        --with-bugurl=http://bugtracker.ipfire.org \
        --disable-libunwind-exceptions \
        --enable-gnu-unique-object