jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: move ccache handling to the toolchain wrapper

Browse Source 
Since we always have a toolchain wrapper now, we can move the ccache
call to the toolchain wrapper.

The hostcc ccache handling obviously stays.

The global addition of ccache to TARGET_CC/CXX is removed, but many
individual packages and infras still add it. This means we have a
chain like this: ccache -> toolchain-wrapper -> ccache -> gcc
However, this is fairly harmless: for cache misses, the inner ccache
just adds overhead and for cache hits, the inner ccache is never
called. Later patches will remove these redundant ccache calls.

As a side effect, perl now supports ccache as well.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Danomi Manchego <danomimanchego123@gmail.com>
Cc: Károly Kasza <kaszak@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Arnout Vandecappelle 2015-10-04 16:23:56 +01:00 committed by Peter Korsgaard
parent 2f8dc29c1d
commit d82f69cf10
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/Makefile.in
View File

@ -189,11 +189,6 @@ TARGET_OBJDUMP = $(TARGET_CROSS)objdump
TARGET_CC_NOCCACHE := $(TARGET_CC) TARGET_CC_NOCCACHE := $(TARGET_CC)
TARGET_CXX_NOCCACHE := $(TARGET_CXX) TARGET_CXX_NOCCACHE := $(TARGET_CXX)
ifeq ($(BR2_CCACHE),y)
TARGET_CC := $(CCACHE) $(TARGET_CC)
TARGET_CXX := $(CCACHE) $(TARGET_CXX)
endif
ifeq ($(BR2_STRIP_strip),y) ifeq ($(BR2_STRIP_strip),y)
STRIP_STRIP_DEBUG := --strip-debug STRIP_STRIP_DEBUG := --strip-debug
STRIP_STRIP_UNNEEDED := --strip-unneeded STRIP_STRIP_UNNEEDED := --strip-unneeded

15
toolchain/toolchain-wrapper.c
View File

@ -23,6 +23,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#ifdef BR_CCACHE
static char ccache_path[PATH_MAX];
#endif
static char path[PATH_MAX]; static char path[PATH_MAX];
static char sysroot[PATH_MAX]; static char sysroot[PATH_MAX];
@ -40,6 +43,9 @@ static char sysroot[PATH_MAX];
#define EXCLUSIVE_ARGS 3 #define EXCLUSIVE_ARGS 3
static char *predef_args[] = { static char *predef_args[] = {
#ifdef BR_CCACHE
ccache_path,
#endif
path, path,
"--sysroot", sysroot, "--sysroot", sysroot,
#ifdef BR_ABI #ifdef BR_ABI
@ -147,6 +153,13 @@ int main(int argc, char **argv)
perror(__FILE__ ": overflow"); perror(__FILE__ ": overflow");
return 3; return 3;
} }
#ifdef BR_CCACHE
ret = snprintf(ccache_path, sizeof(ccache_path), "%s/usr/bin/ccache", absbasedir);
if (ret >= sizeof(ccache_path)) {
perror(__FILE__ ": overflow");
return 3;
}
#endif
ret = snprintf(sysroot, sizeof(sysroot), "%s/" BR_SYSROOT, absbasedir); ret = snprintf(sysroot, sizeof(sysroot), "%s/" BR_SYSROOT, absbasedir);
if (ret >= sizeof(sysroot)) { if (ret >= sizeof(sysroot)) {
perror(__FILE__ ": overflow"); perror(__FILE__ ": overflow");
@ -251,7 +264,7 @@ int main(int argc, char **argv)
} }
} }
if (execv(path, args)) if (execv(args[0], args))
perror(path); perror(path);
free(args); free(args);

4
toolchain/toolchain-wrapper.mk
View File

@ -16,6 +16,10 @@ TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"'
# separate argument when used in execv() by the toolchain wrapper. # separate argument when used in execv() by the toolchain wrapper.
TOOLCHAIN_WRAPPER_ARGS += -DBR_ADDITIONAL_CFLAGS='$(foreach f,$(call qstrip,$(BR2_TARGET_OPTIMIZATION)),"$(f)",)' TOOLCHAIN_WRAPPER_ARGS += -DBR_ADDITIONAL_CFLAGS='$(foreach f,$(call qstrip,$(BR2_TARGET_OPTIMIZATION)),"$(f)",)'
ifeq ($(BR2_CCACHE),y)
TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE
endif
# For simplicity, build directly into the install location # For simplicity, build directly into the install location
define TOOLCHAIN_BUILD_WRAPPER define TOOLCHAIN_BUILD_WRAPPER
$(Q)mkdir -p $(HOST_DIR)/usr/bin $(Q)mkdir -p $(HOST_DIR)/usr/bin