diff options
| author | Roland Shoemaker <roland@golang.org> | 2021-01-20 09:56:46 -0800 |
|---|---|---|
| committer | Roland Shoemaker <roland@golang.org> | 2021-01-20 09:56:46 -0800 |
| commit | 79ea7a16d7e3bc36e98a4b7afd997bb315e80a1c (patch) | |
| tree | 348f738736723bad4f3dbdf866e1b81d6c679dea /src/cmd/dist/buildtool.go | |
| parent | f78276931172f6781bd448a010b547a9517abe41 (diff) | |
| parent | 2117ea9737bc9cb2e30cb087b76a283f68768819 (diff) | |
| download | go-79ea7a16d7e3bc36e98a4b7afd997bb315e80a1c.tar.gz go-79ea7a16d7e3bc36e98a4b7afd997bb315e80a1c.zip | |
[dev.boringcrypto.go1.15] all: merge go1.15.7 into dev.boringcrypto.go1.15
Change-Id: I2d5a481ef3862f558467c6d71f46e483cc50e1fe
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 |