]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
toolchain: fix build on arm with hardfloat host distro.
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:21:47 +0000 (08:21 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:21:47 +0000 (08:21 -0400)
lfs/binutils
lfs/ccache
lfs/gcc

index 48aee5c3284f9b2f04e816332a2584fabbdc01f9..791483f218a7a6c0881c88a4a4f8a3a157ba24f8 100644 (file)
@@ -44,6 +44,7 @@ ifeq "$(ROOT)" ""
 else
 ifeq "$(PASS)" "1"
   CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
        --target=$(CROSSTARGET) \
index b4ef607651e21efca3b20307737782ae722897f7..44010f962248a3fba29b093880d004d8297a12e5 100644 (file)
@@ -34,6 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 
 ifeq "$(PASS)" "1"
        CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+       CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 endif
 
 # Set max cache size to 5GB
diff --git a/lfs/gcc b/lfs/gcc
index 400cf269d7f2d624c648b9c42af27f65a0a94ed2..0bdecdaefbef03ba9b61241473409d1580e9fefe 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -36,6 +36,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 
 # Normal build or /tools build.
 #
@@ -118,10 +119,6 @@ EXTRA_CONFIG += \
 export XCFLAGS = $(CFLAGS)
 export TCFLAGS = $(CFLAGS)
 
-ifeq "$(PASS)" "1"
-  CFLAGS =
-endif
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################