diff options
author | Rosen Penev <rosenp@gmail.com> | 2020-12-23 01:16:17 -0800 |
---|---|---|
committer | Hans Dedecker <dedeckeh@gmail.com> | 2020-12-31 10:03:21 +0100 |
commit | 31554e50d2c3d0707a40f9ed08b0d6999f584ba2 (patch) | |
tree | 59fde8c27d0a816ab8d63c4975e190bb75f912bc /tools/ccache/patches | |
parent | f3e45c45cba1a541693da840642b08226653dff4 (diff) | |
download | upstream-31554e50d2c3d0707a40f9ed08b0d6999f584ba2.tar.gz upstream-31554e50d2c3d0707a40f9ed08b0d6999f584ba2.tar.bz2 upstream-31554e50d2c3d0707a40f9ed08b0d6999f584ba2.zip |
ccache: update to 4.1
Upstream switched to building with CMake. Adjust accordingly.
Reapplied patch as upstream changed the file format.
Added HOST_BUILD_PARALLEL for faster compilation.
Added cmake tool dependency and removed circular dependencies as a
result.
Adjusted dependent tools to use NOCACHE as they are needed to build
ccache.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'tools/ccache/patches')
-rw-r--r-- | tools/ccache/patches/100-honour-copts.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index ccfa1c0247..e4045ef9be 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,10 +1,10 @@ ---- a/src/ccache.c -+++ b/src/ccache.c -@@ -2277,6 +2277,7 @@ calculate_object_hash(struct args *args, - "CPLUS_INCLUDE_PATH", - "OBJC_INCLUDE_PATH", - "OBJCPLUS_INCLUDE_PATH", // clang -+ "GCC_HONOUR_COPTS", - NULL - }; - for (const char **p = envvars; *p; ++p) { +--- a/src/ccache.cpp ++++ b/src/ccache.cpp +@@ -1654,6 +1654,7 @@ calculate_result_name(Context& ctx, + "CPLUS_INCLUDE_PATH", + "OBJC_INCLUDE_PATH", + "OBJCPLUS_INCLUDE_PATH", // clang ++ "GCC_HONOUR_COPTS", + nullptr}; + for (const char** p = envvars; *p; ++p) { + const char* v = getenv(*p); |