aboutsummaryrefslogtreecommitdiff
path: root/compiler_wrapper/command.go
diff options
context:
space:
mode:
authorTobias Bosch <tbosch@google.com>2019-07-11 04:24:52 -0700
committerTobias Bosch <tbosch@google.com>2019-07-13 12:29:19 +0000
commit584728183f90cf6ef27fa09b52c8ee5203c87e4a (patch)
tree4d725a5553ab177f66b86c27075935ee5827cae3 /compiler_wrapper/command.go
parent6652ca32cb1194acb1771121189f1531c3644402 (diff)
downloadtoolchain-utils-584728183f90cf6ef27fa09b52c8ee5203c87e4a.tar.gz
Add -print-cmdline and -print-config
BUG=chromium:773875 TEST=unit test Change-Id: Ib25e582257694f3a3457795873a249735e3aaf82 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1697931 Tested-by: Tobias Bosch <tbosch@google.com> Reviewed-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'compiler_wrapper/command.go')
-rw-r--r--compiler_wrapper/command.go10
1 files changed, 9 insertions, 1 deletions
diff --git a/compiler_wrapper/command.go b/compiler_wrapper/command.go
index b1c6f5f0..4e44e1a7 100644
--- a/compiler_wrapper/command.go
+++ b/compiler_wrapper/command.go
@@ -37,6 +37,14 @@ func ensurePathEnv(cmd *exec.Cmd) {
cmd.Env = append(cmd.Env, "PATH=")
}
+func getAbsCmdPath(env env, cmd *command) string {
+ path := cmd.path
+ if !filepath.IsAbs(path) {
+ path = filepath.Join(env.getwd(), path)
+ }
+ return path
+}
+
func newCommandBuilder(env env, cfg *config, cmd *command) (*commandBuilder, error) {
basename := filepath.Base(cmd.path)
nameParts := strings.Split(basename, "-")
@@ -52,7 +60,7 @@ func newCommandBuilder(env env, cfg *config, cmd *command) (*commandBuilder, err
default:
compilerType = gccType
}
- absWrapperDir, err := getAbsWrapperDir(env, cmd.path)
+ absWrapperDir, err := getAbsWrapperDir(env, cmd)
if err != nil {
return nil, err
}