From 62a430f93f97be9f1a56ac42e33666009f83c871 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 28 Aug 2012 08:21:47 -0400
Subject: [PATCH] toolchain: fix build on arm with hardfloat host distro.

---
 lfs/binutils | 1 +
 lfs/ccache   | 1 +
 lfs/gcc      | 5 +----
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lfs/binutils b/lfs/binutils
index 48aee5c328..791483f218 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -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) \
diff --git a/lfs/ccache b/lfs/ccache
index b4ef607651..44010f9622 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -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 400cf269d7..0bdecdaefb 100644
--- 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
 ###############################################################################
-- 
2.39.2