forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This reverts commit b1952dc 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 <[email protected]>
- Loading branch information
Showing
2 changed files
with
18 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) { |