mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-14 21:12:59 +02:00
toolchain: fix build with gcc<8 on builder.
gcc-7 not support -fcf-protection so filter it from CFLAGS. also filter -mtune in first pass because it should optimized for the actual host. Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
@@ -51,6 +51,8 @@ ifeq "$(PASS)" "1"
|
||||
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
|
||||
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
|
||||
EXTRA_CONFIG = \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2020 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 #
|
||||
@@ -34,10 +34,13 @@ TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
|
||||
|
||||
ifeq "$(PASS)" "1"
|
||||
CFLAGS := $(patsubst -march=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mtune=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
|
||||
4
lfs/gcc
4
lfs/gcc
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2020 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 #
|
||||
@@ -44,6 +44,8 @@ CFLAGS := $(filter-out -fexceptions,$(CFLAGS))
|
||||
ifeq "$(PASS)" "1"
|
||||
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
|
||||
CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
|
||||
endif
|
||||
|
||||
CXXFLAGS := $(CFLAGS)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2020 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 #
|
||||
|
||||
Reference in New Issue
Block a user