diff options
| author | Josh Bleecher Snyder <josharian@gmail.com> | 2014-12-31 13:25:52 -0800 |
|---|---|---|
| committer | Josh Bleecher Snyder <josharian@gmail.com> | 2015-01-02 18:36:44 +0000 |
| commit | 8bbd80063b986e106ab35727e483be8bdcfd9f5b (patch) | |
| tree | b3409081c0f692183f29c633477fe45d97ba9e18 | |
| parent | 79c4fad8c2416bd7c7865b337d70bc7f92153415 (diff) | |
| download | go-git-8bbd80063b986e106ab35727e483be8bdcfd9f5b.tar.gz | |
cmd/go: put user ldflags at the end of the linker invocation
If the user provided a key but no value via -ldflag -X,
another linker flag was used as the value.
Placing the user's flags at the end avoids this problem.
It also provides the user the opportunity to
override existing linker flags.
Fixes #8810.
Change-Id: I96f4190713dc9a9c29142e56658446fba7fb6bc8
Reviewed-on: https://go-review.googlesource.com/2242
Reviewed-by: Minux Ma <minux@golang.org>
| -rw-r--r-- | src/cmd/go/build.go | 5 | ||||
| -rw-r--r-- | test/linkx_run.go | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go index 58fc98d84b..cd17aba737 100644 --- a/src/cmd/go/build.go +++ b/src/cmd/go/build.go @@ -1776,9 +1776,7 @@ func (gcToolchain) ld(b *builder, p *Package, out string, allactions []*action, cxx = true } } - ldflags := buildLdflags - // Limit slice capacity so that concurrent appends do not race on the shared array. - ldflags = ldflags[:len(ldflags):len(ldflags)] + var ldflags []string if buildContext.InstallSuffix != "" { ldflags = append(ldflags, "-installsuffix", buildContext.InstallSuffix) } @@ -1824,6 +1822,7 @@ func (gcToolchain) ld(b *builder, p *Package, out string, allactions []*action, } } } + ldflags = append(ldflags, buildLdflags...) return b.run(".", p.ImportPath, nil, tool(archChar+"l"), "-o", out, importArgs, ldflags, mainpkg) } diff --git a/test/linkx_run.go b/test/linkx_run.go index 11b66ed5a9..f3029f50a9 100644 --- a/test/linkx_run.go +++ b/test/linkx_run.go @@ -16,6 +16,7 @@ import ( ) func main() { + // Successful run cmd := exec.Command("go", "run", "-ldflags=-X main.tbd hello -X main.overwrite trumped -X main.nosuchsymbol neverseen", "linkx.go") out, err := cmd.CombinedOutput() if err != nil { @@ -30,4 +31,12 @@ func main() { fmt.Printf("got %q want %q\n", got, want) os.Exit(1) } + + // Issue 8810 + cmd = exec.Command("go", "run", "-ldflags=-X main.tbd", "linkx.go") + _, err = cmd.CombinedOutput() + if err == nil { + fmt.Println("-X linker flag should not accept keys without values") + os.Exit(1) + } } |