Merge branch 'master' into next

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

diff --git a/lfs/ccache b/lfs/ccache
index 682f4998a67ebccfc9efb5701e442b1146bf01b3..9fbb728226dad672b1ab133855e19c91c48365b0 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -35,7 +35,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 ifeq "$(PASS)" "1"
        CFLAGS := $(patsubst -march=%,,$(CFLAGS))
        CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
-       CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
 endif
 
 # Set max cache size to 5GB
@@ -83,7 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
 
-ifeq "$(PASS)" "1"
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(PASS)" "1"
        mkdir -pv /tools/ccache/bin
        ln -svf ../../bin/ccache /tools/ccache/bin/gcc
        ln -svf ../../bin/ccache /tools/ccache/bin/g++
@@ -93,13 +93,14 @@ ifeq "$(PASS)" "1"
        ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-g++
        ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-cc
        ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-c++
-endif
+ endif
 
-ifeq "$(PASS)" "2"
+ ifeq "$(PASS)" "2"
        ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-gcc
        ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-g++
        ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-cc
        ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-c++
+ endif
 endif
 
        @rm -rf $(DIR_APP)