diff options
| author | Roland Shoemaker <roland@golang.org> | 2021-01-19 15:52:45 -0800 |
|---|---|---|
| committer | Roland Shoemaker <roland@golang.org> | 2021-01-19 15:52:50 -0800 |
| commit | c88ae12aee33bf5b7ddcd002fdf1ab77ee796c7e (patch) | |
| tree | 1832f503e8fa852f1c88f602abe0c9600f11c783 /src/cmd/dist/buildtool.go | |
| parent | 069f9d96d179becc61231d566c9a75f1ec26e991 (diff) | |
| parent | 2117ea9737bc9cb2e30cb087b76a283f68768819 (diff) | |
| download | go-c88ae12aee33bf5b7ddcd002fdf1ab77ee796c7e.tar.gz go-c88ae12aee33bf5b7ddcd002fdf1ab77ee796c7e.zip | |
[release-branch.go1.15] all: merge release-branch.go1.15-security into release-branch.go1.15
Change-Id: I0b607475b3d767b712bfb3c9a350b32f3491517c
Diffstat (limited to 'src/cmd/dist/buildtool.go')
| -rw-r--r-- | src/cmd/dist/buildtool.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go index 9502dac4eb..710f4bde6f 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -302,8 +302,10 @@ func bootstrapFixImports(srcFile string) string { continue } if strings.HasPrefix(line, `import "`) || strings.HasPrefix(line, `import . "`) || - inBlock && (strings.HasPrefix(line, "\t\"") || strings.HasPrefix(line, "\t. \"")) { + inBlock && (strings.HasPrefix(line, "\t\"") || strings.HasPrefix(line, "\t. \"") || strings.HasPrefix(line, "\texec \"")) { line = strings.Replace(line, `"cmd/`, `"bootstrap/cmd/`, -1) + // During bootstrap, must use plain os/exec. + line = strings.Replace(line, `exec "internal/execabs"`, `"os/exec"`, -1) for _, dir := range bootstrapDirs { if strings.HasPrefix(dir, "cmd/") { continue |