From 28979264d4c945fcd9a3f09b385a7b67f051419f Mon Sep 17 00:00:00 2001 From: Manoj Gupta Date: Fri, 13 Mar 2020 11:05:26 -0700 Subject: compiler_wrapper: Stop setting CCACHE_BASEDIR CCACHE_BASEDIR used to be set to sysroot so that ccache can reuse compilation results across different boards. This is not useful on builders and also less useful for board builds since we set closer to target CFLAGS now. It also breaks use of -fmacro-prefix-map option in clang/gcc. So rip it out and simplify the rest of code. BUG=chromium:983759 TEST=go test Change-Id: Ia99ca994c976ee1137c3d904a78f7e25931c70f6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2103170 Commit-Queue: Manoj Gupta Tested-by: Manoj Gupta Reviewed-by: George Burgess --- compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json') diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index 77b99ce4..ce83cd72 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -41,7 +41,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -94,7 +93,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -150,7 +148,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", -- cgit v1.2.3