aboutsummaryrefslogtreecommitdiff
path: root/compiler_wrapper/compiler_wrapper.go
diff options
context:
space:
mode:
Diffstat (limited to 'compiler_wrapper/compiler_wrapper.go')
-rw-r--r--compiler_wrapper/compiler_wrapper.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index b0269abe..314a8a71 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -43,6 +43,9 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int
if err != nil {
return 0, err
}
+ processPrintConfigFlag(mainBuilder)
+ processPrintCmdlineFlag(mainBuilder)
+ env = mainBuilder.env
var compilerCmd *command
clangSyntax := processClangSyntaxFlag(mainBuilder)
if mainBuilder.target.compilerType == clangType {
@@ -133,10 +136,8 @@ func processGomaCCacheFlags(sysroot string, builder *commandBuilder) {
}
}
-func getAbsWrapperDir(env env, wrapperPath string) (string, error) {
- if !filepath.IsAbs(wrapperPath) {
- wrapperPath = filepath.Join(env.getwd(), wrapperPath)
- }
+func getAbsWrapperDir(env env, wrapperCmd *command) (string, error) {
+ wrapperPath := getAbsCmdPath(env, wrapperCmd)
evaledCmdPath, err := filepath.EvalSymlinks(wrapperPath)
if err != nil {
return "", wrapErrorwithSourceLocf(err, "failed to evaluate symlinks for %s", wrapperPath)