792e8bc8bb
Update ccache 3.3.2 and refresh patch Preserving the original patch comments here by Karl Vogel: "From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001 From: Karl Vogel <karl.vogel@gmail.com> Date: Tue, 14 Jul 2015 11:05:33 +0200 Subject: [PATCH] Include environment variable GCC_HONOUR_COPTS in hash. The OpenWRT patch, 910-mbsd_multi.patch, to GCC adds an extra compilation flag, -fhonour-copts, which is influenced by an environment variable called GCC_HONOUR_COPTS. Include this environment var in the hash calculation as otherwise the gcc stdout warning from a previous compilation might be shown where, even when GCC_HONOUR_COPTS is in 's'ilent mode. Signed-off-by: Karl Vogel <karl.vogel@gmail.com>" Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
13 lines
367 B
Diff
13 lines
367 B
Diff
diff --git a/ccache.c b/ccache.c
|
|
index 88e0ec5..7dffeb4 100644
|
|
--- a/ccache.c
|
|
+++ b/ccache.c
|
|
@@ -1762,6 +1762,7 @@ calculate_object_hash(struct args *args, struct mdfour *hash, int direct_mode)
|
|
"CPLUS_INCLUDE_PATH",
|
|
"OBJC_INCLUDE_PATH",
|
|
"OBJCPLUS_INCLUDE_PATH", // clang
|
|
+ "GCC_HONOUR_COPTS",
|
|
NULL
|
|
};
|
|
for (const char **p = envvars; *p; ++p) {
|