mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-06 18:02:02 +01:00
Revert recent ccache changes
The workaround for using the new ccache version with a hardened compiler in commit 923a6b17 was insufficient and produced a broken kernel. Roll back that commit along with the ccache version update, 0ba2d4d4.
This commit is contained in:
parent
7ec2488bb9
commit
177487956b
@ -84,11 +84,6 @@ update_bootengine_cpio() {
|
||||
|
||||
kmake() {
|
||||
local kernel_arch=$(tc-arch-kernel)
|
||||
# Disable hardened PIE explicitly, >=ccache-3.2 breaks the hardened
|
||||
# compiler's auto-detection of kernel builds.
|
||||
if gcc-specs-pie; then
|
||||
set -- KCFLAGS=-nopie "$@"
|
||||
fi
|
||||
emake ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@"
|
||||
}
|
||||
|
||||
|
||||
@ -112,6 +112,3 @@ dev-util/checkbashisms
|
||||
|
||||
# >=3.16 required by docker 1.4
|
||||
=sys-fs/btrfs-progs-3.17.1
|
||||
|
||||
# ccache 3.1.9 (current stable) has a locking bug
|
||||
=dev-util/ccache-3.2.1-r1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user