compiler_wrapper: remove useless gomaEnabled var
This CL addresses a comment on CL:2780051 which reenabled Goma with
Rusage. Since 2780051 there was an extraneous variable left over. This
also removes a now obsolete test.
BUG=None
TEST=Ran all package go tests
Change-Id: I784c1d93fc94333e098bf30a8777469379bfef71
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2823244
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Denis Nikitin <denik@chromium.org>
Tested-by: Ryan Beltran <ryanbeltran@chromium.org>
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index d2b4769..8538fd4 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -80,7 +80,6 @@
// Disable CCache for rusage logs
// Note: Disabling Goma causes timeout related INFRA_FAILUREs in builders
- allowGoma := true
allowCCache := !rusageEnabled
workAroundKernelBugWithRetries := false
@@ -91,7 +90,7 @@
mainBuilder.addPreUserArgs(mainBuilder.cfg.clangFlags...)
mainBuilder.addPreUserArgs(mainBuilder.cfg.commonFlags...)
mainBuilder.addPostUserArgs(mainBuilder.cfg.clangPostFlags...)
- if _, err := processGomaCccFlags(allowGoma, mainBuilder); err != nil {
+ if _, err := processGomaCccFlags(mainBuilder); err != nil {
return 0, err
}
compilerCmd = mainBuilder.build()
@@ -127,14 +126,14 @@
return 0, err
}
}
- if err := processGomaCCacheFlags(allowGoma, allowCCache, mainBuilder); err != nil {
+ if err := processGomaCCacheFlags(allowCCache, mainBuilder); err != nil {
return 0, err
}
compilerCmd = mainBuilder.build()
} else {
if clangSyntax {
allowCCache = false
- clangCmd, err := calcClangCommand(allowGoma, allowCCache, mainBuilder.clone())
+ clangCmd, err := calcClangCommand(allowCCache, mainBuilder.clone())
if err != nil {
return 0, err
}
@@ -267,12 +266,12 @@
return processClangFlags(builder)
}
-func calcClangCommand(allowGoma bool, allowCCache bool, builder *commandBuilder) (*command, error) {
+func calcClangCommand(allowCCache bool, builder *commandBuilder) (*command, error) {
err := prepareClangCommand(builder)
if err != nil {
return nil, err
}
- if err := processGomaCCacheFlags(allowGoma, allowCCache, builder); err != nil {
+ if err := processGomaCCacheFlags(allowCCache, builder); err != nil {
return nil, err
}
return builder.build(), nil
@@ -286,7 +285,7 @@
calcCommonPreUserArgs(builder)
processGccFlags(builder)
if !builder.cfg.isHostWrapper {
- if err := processGomaCCacheFlags(!enableRusage, !enableRusage, builder); err != nil {
+ if err := processGomaCCacheFlags(!enableRusage, builder); err != nil {
return nil, err
}
}
@@ -304,10 +303,10 @@
processSanitizerFlags(builder)
}
-func processGomaCCacheFlags(allowGoma bool, allowCCache bool, builder *commandBuilder) (err error) {
+func processGomaCCacheFlags(allowCCache bool, builder *commandBuilder) (err error) {
gomaccUsed := false
if !builder.cfg.isHostWrapper {
- gomaccUsed, err = processGomaCccFlags(allowGoma, builder)
+ gomaccUsed, err = processGomaCccFlags(builder)
if err != nil {
return err
}