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 <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index c8c3b6f..da9c866 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -91,7 +91,7 @@
}
} else if mainBuilder.target.compilerType == clangType {
cSrcFile, useClangTidy := processClangTidyFlags(mainBuilder)
- sysroot, err := prepareClangCommand(mainBuilder)
+ err := prepareClangCommand(mainBuilder)
if err != nil {
return 0, err
}
@@ -103,7 +103,7 @@
return 0, err
}
}
- if err := processGomaCCacheFlags(sysroot, allowCCache, mainBuilder); err != nil {
+ if err := processGomaCCacheFlags(allowCCache, mainBuilder); err != nil {
return 0, err
}
compilerCmd = mainBuilder.build()
@@ -162,35 +162,30 @@
return wrapSubprocessErrorWithSourceLoc(compilerCmd, env.exec(compilerCmd))
}
-func prepareClangCommand(builder *commandBuilder) (sysroot string, err error) {
- sysroot = ""
+func prepareClangCommand(builder *commandBuilder) (err error) {
if !builder.cfg.isHostWrapper {
- sysroot = processSysrootFlag(builder)
+ processSysrootFlag(builder)
}
builder.addPreUserArgs(builder.cfg.clangFlags...)
builder.addPostUserArgs(builder.cfg.clangPostFlags...)
calcCommonPreUserArgs(builder)
- if err := processClangFlags(builder); err != nil {
- return "", err
- }
- return sysroot, nil
+ return processClangFlags(builder)
}
func calcClangCommand(allowCCache bool, builder *commandBuilder) (*command, error) {
- sysroot, err := prepareClangCommand(builder)
+ err := prepareClangCommand(builder)
if err != nil {
return nil, err
}
- if err := processGomaCCacheFlags(sysroot, allowCCache, builder); err != nil {
+ if err := processGomaCCacheFlags(allowCCache, builder); err != nil {
return nil, err
}
return builder.build(), nil
}
func calcGccCommand(builder *commandBuilder) (*command, error) {
- sysroot := ""
if !builder.cfg.isHostWrapper {
- sysroot = processSysrootFlag(builder)
+ processSysrootFlag(builder)
}
builder.addPreUserArgs(builder.cfg.gccFlags...)
if !builder.cfg.isHostWrapper {
@@ -199,7 +194,7 @@
processGccFlags(builder)
if !builder.cfg.isHostWrapper {
allowCCache := true
- if err := processGomaCCacheFlags(sysroot, allowCCache, builder); err != nil {
+ if err := processGomaCCacheFlags(allowCCache, builder); err != nil {
return nil, err
}
}
@@ -217,7 +212,7 @@
processSanitizerFlags(builder)
}
-func processGomaCCacheFlags(sysroot string, allowCCache bool, builder *commandBuilder) (err error) {
+func processGomaCCacheFlags(allowCCache bool, builder *commandBuilder) (err error) {
gomaccUsed := false
if !builder.cfg.isHostWrapper {
gomaccUsed, err = processGomaCccFlags(builder)
@@ -226,7 +221,7 @@
}
}
if !gomaccUsed && allowCCache {
- processCCacheFlag(sysroot, builder)
+ processCCacheFlag(builder)
}
return nil
}