webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

toolchain: Build without hardening

Browse Source 
The toolchain will be built without hardening which makes
the entire bootstrapping process way more complicated than
necessary and sometimes fail on some host distribution.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-04-13 16:03:38 +02:00
parent 962ddd8d73
commit e259f335ae
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/binutils
View File

@@ -46,7 +46,6 @@ else
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -march=%,,$(CFLAGS)) CFLAGS := $(patsubst -march=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
TARGET = $(DIR_INFO)/$(THISAPP)-tools1 TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \ EXTRA_CONFIG = \
--target=$(CROSSTARGET) \ --target=$(CROSSTARGET) \

1
lfs/ccache
View File

@@ -35,7 +35,6 @@ TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -march=%,,$(CFLAGS)) CFLAGS := $(patsubst -march=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
endif endif
# Set max cache size to 5GB # Set max cache size to 5GB

7
lfs/gcc
View File

@@ -59,10 +59,6 @@ ifeq "$(ROOT)" ""
EXTRA_INSTALL = EXTRA_INSTALL =
else else
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
CXXFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CXXFLAGS))
CXXFLAGS += -std=gnu++98
TARGET = $(DIR_INFO)/$(THISAPP)-tools1 TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \ EXTRA_CONFIG = \
--target=$(CROSSTARGET) \ --target=$(CROSSTARGET) \
@@ -135,9 +131,6 @@ else
EXTRA_INSTALL = EXTRA_INSTALL =
endif endif
endif endif
# Disable stack protection in toolchain.
CFLAGS += -fno-stack-protector
endif endif
ifeq "$(MACHINE)" "armv5tel" ifeq "$(MACHINE)" "armv5tel"

21
tools/make-functions
View File

@@ -108,8 +108,10 @@ configure_target() {
# Old variable names # Old variable names
MACHINE="${TARGET_ARCH}" MACHINE="${TARGET_ARCH}"
CFLAGS="-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC" # Enables hardening
CFLAGS="${CFLAGS} -fstack-protector-strong --param=ssp-buffer-size=4 ${CFLAGS_ARCH}" HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4"
CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
CXXFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"
} }
@@ -478,7 +480,8 @@ entershell() {
PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \ PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \ VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
CCACHE_DIR=/usr/src/ccache \ CCACHE_DIR=/usr/src/ccache \
CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
@@ -604,7 +607,8 @@ lfsmake2() {
SYSTEM_RELEASE="${SYSTEM_RELEASE}" \ SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
CONFIG_ROOT=$CONFIG_ROOT \ CONFIG_ROOT=$CONFIG_ROOT \
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
CCACHE_DIR=/usr/src/ccache \ CCACHE_DIR=/usr/src/ccache \
CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
@@ -646,7 +650,8 @@ ipfiremake() {
CONFIG_ROOT=$CONFIG_ROOT \ CONFIG_ROOT=$CONFIG_ROOT \
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
SYSTEM_RELEASE="$SYSTEM_RELEASE" \ SYSTEM_RELEASE="$SYSTEM_RELEASE" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
CCACHE_DIR=/usr/src/ccache \ CCACHE_DIR=/usr/src/ccache \
CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
@@ -686,7 +691,8 @@ ipfiredist() {
VERSION=$VERSION \ VERSION=$VERSION \
CONFIG_ROOT=$CONFIG_ROOT \ CONFIG_ROOT=$CONFIG_ROOT \
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
CCACHE_DIR=/usr/src/ccache \ CCACHE_DIR=/usr/src/ccache \
CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
@@ -727,7 +733,8 @@ installmake() {
SYSTEM_RELEASE="${SYSTEM_RELEASE}" \ SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
CONFIG_ROOT=$CONFIG_ROOT \ CONFIG_ROOT=$CONFIG_ROOT \
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
KVER=$KVER \ KVER=$KVER \
BUILDTARGET="$BUILDTARGET" \ BUILDTARGET="$BUILDTARGET" \