Merge branch 'core110'

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

diff --git a/lfs/ccache b/lfs/ccache
index 64b09d1fa34a6529aa403d6fd524896c75708e7f..c35c6705dcead15477ab0bd1eb45be4f8c18f108 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -35,6 +35,7 @@ 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
@@ -82,7 +83,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++
@@ -92,13 +94,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)