From 67790f569514fd612dad3ca4026cde652875be08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 22 Dec 2020 20:38:13 +0100 Subject: Revert "ccache: update to 4.1" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b1952dc259ce3eb7ac6023c9e02d5adf2546efca as it's causing issues on the buildbot which uses some kind of ccache wrapper and so the breakage needs to be investigated further: bash: cmake: command not found time: tools/ccache/compile#0.05#0.03#0.15 ERROR: tools/ccache failed to build. Signed-off-by: Petr Štetiar --- tools/ccache/patches/100-honour-copts.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tools/ccache/patches/100-honour-copts.patch') diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index e4045ef9be..ccfa1c0247 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,10 +1,10 @@ ---- 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); +--- 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) { -- cgit v1.2.3