mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-06 18:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1048 from marineam/ccache

Browse Source 
Rollback and disable ccache
This commit is contained in:
Michael Marineau 2015-01-08 16:41:10 -08:00
commit 412635d5e2
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass vendored
View File

@ -84,11 +84,6 @@ update_bootengine_cpio() {
kmake() { kmake() {
local kernel_arch=$(tc-arch-kernel) 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}-" "$@" emake ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@"
} }

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults vendored
View File

@ -73,7 +73,7 @@ PORTAGE_BUNZIP2_COMMAND="lbunzip2"
CCACHE_SIZE="2.5G" CCACHE_SIZE="2.5G"
# Always build binary packages, remove old build logs, avoid running as root. # Always build binary packages, remove old build logs, avoid running as root.
FEATURES="buildpkg ccache clean-logs compressdebug parallel-install splitdebug FEATURES="buildpkg clean-logs compressdebug parallel-install splitdebug
userfetch userpriv usersandbox ipc-sandbox network-sandbox userfetch userpriv usersandbox ipc-sandbox network-sandbox
-merge-sync" -merge-sync"

3
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords vendored
View File

@ -112,6 +112,3 @@ dev-util/checkbashisms
# >=3.16 required by docker 1.4 # >=3.16 required by docker 1.4
=sys-fs/btrfs-progs-3.17.1 =sys-fs/btrfs-progs-3.17.1
# ccache 3.1.9 (current stable) has a locking bug
=dev-util/ccache-3.2.1-r1