Skip to content

Commit 6417e91

Browse files
pccianlancetaylor
authored andcommitted
cmd/link: pass provided ldflags when testing whether an ldflag is supported
It's possible for one of the ldflags to cause the compiler driver to use a different linker than the default, so we need to make sure that the flag is supported by whichever linker is specified. Fixes #27110. Change-Id: Ic0c51b886e34344d324e68cbf6673b168c14992f Reviewed-on: https://go-review.googlesource.com/130316 Run-TryBot: Ian Lance Taylor <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 247b034 commit 6417e91

File tree

1 file changed

+6
-1
lines changed
  • src/cmd/link/internal/ld

1 file changed

+6
-1
lines changed

src/cmd/link/internal/ld/lib.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,12 @@ func linkerFlagSupported(linker, flag string) bool {
13661366
}
13671367
})
13681368

1369-
cmd := exec.Command(linker, flag, "trivial.c")
1369+
var flags []string
1370+
flags = append(flags, ldflag...)
1371+
flags = append(flags, strings.Fields(*flagExtldflags)...)
1372+
flags = append(flags, flag, "trivial.c")
1373+
1374+
cmd := exec.Command(linker, flags...)
13701375
cmd.Dir = *flagTmpdir
13711376
cmd.Env = append([]string{"LC_ALL=C"}, os.Environ()...)
13721377
out, err := cmd.CombinedOutput()

0 commit comments

Comments
 (0)