From 22a504c69cb578f6e34928f3d862beac635e5224 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 20 Jan 2016 19:28:56 +0100 Subject: [PATCH] toolchain: fix build on hosts that not support strong stackprotect Signed-off-by: Arne Fitzenreiter --- lfs/binutils | 3 ++- lfs/ccache | 3 ++- lfs/gcc | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lfs/binutils b/lfs/binutils index 402fdfbdd0..5afaeec2fb 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 # @@ -46,6 +46,7 @@ else ifeq "$(PASS)" "1" CFLAGS := $(patsubst -march=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS)) + CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS)) TARGET = $(DIR_INFO)/$(THISAPP)-tools1 EXTRA_CONFIG = \ --target=$(CROSSTARGET) \ diff --git a/lfs/ccache b/lfs/ccache index 64b09d1fa3..682f4998a6 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 diff --git a/lfs/gcc b/lfs/gcc index 00f64c6997..52d1daefcf 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -59,6 +59,8 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else ifeq "$(PASS)" "1" + CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS)) + CXXFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CXXFLAGS)) TARGET = $(DIR_INFO)/$(THISAPP)-tools1 EXTRA_CONFIG = \ --target=$(CROSSTARGET) \ -- 2.39.5