Don't compile first pass of toolchain with -march=...

Needed to cross compile the i586 toolchain on x86_64.

diff --git a/lfs/binutils b/lfs/binutils
index 104a2a7f89dba3b5623858f0b8ee91c8eb73a1d9..9f687ad561488f3f2ca3c2979986e7c71c64e462 100644 (file)
--- 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 22b8c5e0b39d50c6d84cb13c291ff1c3176250fe..454032d0e1ee902127799b767b6d93cc29f643ab 100644 (file)
--- 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 82e0d915d0c1ed3ee9c8ffefa9b3adacbc05a64c..c8bcb08f27a4cda89eabe4a5c7ff835e857c1f60 100644 (file)
--- 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) \