diff --git a/Makefile b/Makefile index 4305c8c3dd..7d2081b98e 100644 --- a/Makefile +++ b/Makefile @@ -478,8 +478,7 @@ BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR)) export BR_CACHE_DIR HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) -else -export BR_NO_CCACHE +export BR2_USE_CCACHE ?= 1 endif # Scripts in support/ or post-build scripts may need to reference diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 0fb6064b1c..37b24dd24a 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -507,8 +507,10 @@ int main(int argc, char **argv) exec_args = args; #ifdef BR_CCACHE - if (getenv("BR_NO_CCACHE")) - /* Skip the ccache call */ + /* If BR2_USE_CCACHE is not defined, or its value is not 1, + * skip the ccache call */ + char *br_use_ccache = getenv("BR2_USE_CCACHE"); + if (!br_use_ccache || strncmp(br_use_ccache, "1", strlen("1"))) exec_args++; #endif