From 222362c3e20b9397ede90db7984e7511537d8e94 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Aug 2012 18:48:10 +0200
Subject: [PATCH] Don't compile first pass of toolchain with -march=...

Needed to cross compile the i586 toolchain on x86_64.
---
 lfs/binutils | 1 +
 lfs/ccache   | 2 +-
 lfs/gcc      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lfs/binutils b/lfs/binutils
index 104a2a7f89..9f687ad561 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -43,6 +43,7 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL = tooldir=/usr
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
diff --git a/lfs/ccache b/lfs/ccache
index 22b8c5e0b3..454032d0e1 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 
 ifeq "$(PASS)" "1"
-	CFLAGS += -static
+	CFLAGS := $(patsubst -march=%,,$(CFLAGS)) -static
 endif
 
 # Set max cache size to 5GB
diff --git a/lfs/gcc b/lfs/gcc
index 82e0d915d0..c8bcb08f27 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -52,6 +52,7 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
-- 
2.39.2