Commit d82f69cf authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Peter Korsgaard
Browse files

infra: move ccache handling to the toolchain wrapper 



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: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Danomi Manchego <danomimanchego123@gmail.com>
Cc: Károly Kasza <kaszak@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 2f8dc29c

package/Makefile.in

+0 −5
Original line number Diff line number Diff line
@@ -189,11 +189,6 @@ TARGET_OBJDUMP = $(TARGET_CROSS)objdump 
TARGET_CC_NOCCACHE  := $(TARGET_CC)

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)

STRIP_STRIP_DEBUG := --strip-debug

STRIP_STRIP_UNNEEDED := --strip-unneeded

toolchain/toolchain-wrapper.c

+14 −1
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#include <stdlib.h>

#include <errno.h>



#ifdef BR_CCACHE

static char ccache_path[PATH_MAX];

#endif

static char path[PATH_MAX];

static char sysroot[PATH_MAX];
@@ -40,6 +43,9 @@ static char sysroot[PATH_MAX]; 
#define EXCLUSIVE_ARGS	3



static char *predef_args[] = {

#ifdef BR_CCACHE

	ccache_path,

#endif

	path,

	"--sysroot", sysroot,

#ifdef BR_ABI
@@ -147,6 +153,13 @@ int main(int argc, char **argv) 
		perror(__FILE__ ": overflow");

		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);

	if (ret >= sizeof(sysroot)) {

		perror(__FILE__ ": overflow");
@@ -251,7 +264,7 @@ int main(int argc, char **argv) 
		}

	}



	if (execv(path, args))

	if (execv(args[0], args))

		perror(path);



	free(args);

toolchain/toolchain-wrapper.mk

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"' 
# separate argument when used in execv() by the toolchain wrapper.

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

define TOOLCHAIN_BUILD_WRAPPER

	$(Q)mkdir -p $(HOST_DIR)/usr/bin