diff options
Diffstat (limited to 'meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch')
-rw-r--r-- | meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch index f8dca65ed4..02269be969 100644 --- a/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch | |||
@@ -44,7 +44,7 @@ Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> | |||
44 | 1 file changed, 75 insertions(+), 1 deletion(-) | 44 | 1 file changed, 75 insertions(+), 1 deletion(-) |
45 | 45 | ||
46 | diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go | 46 | diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go |
47 | index adc9fd2..5fff592 100644 | 47 | index 06ee4de8a9..74b7c7098f 100644 |
48 | --- a/src/cmd/dist/build.go | 48 | --- a/src/cmd/dist/build.go |
49 | +++ b/src/cmd/dist/build.go | 49 | +++ b/src/cmd/dist/build.go |
50 | @@ -46,6 +46,7 @@ var ( | 50 | @@ -46,6 +46,7 @@ var ( |
@@ -83,7 +83,7 @@ index adc9fd2..5fff592 100644 | |||
83 | xatexit(func() { | 83 | xatexit(func() { |
84 | if files := xreaddir(goosGoarch); len(files) == 0 { | 84 | if files := xreaddir(goosGoarch); len(files) == 0 { |
85 | xremove(goosGoarch) | 85 | xremove(goosGoarch) |
86 | @@ -1344,14 +1350,20 @@ func cmdbootstrap() { | 86 | @@ -1338,14 +1344,20 @@ func cmdbootstrap() { |
87 | defer timelog("end", "dist bootstrap") | 87 | defer timelog("end", "dist bootstrap") |
88 | 88 | ||
89 | var debug, distpack, force, noBanner, noClean bool | 89 | var debug, distpack, force, noBanner, noClean bool |
@@ -105,7 +105,7 @@ index adc9fd2..5fff592 100644 | |||
105 | 105 | ||
106 | if noClean { | 106 | if noClean { |
107 | xprintf("warning: --no-clean is deprecated and has no effect; use 'go install std cmd' instead\n") | 107 | xprintf("warning: --no-clean is deprecated and has no effect; use 'go install std cmd' instead\n") |
108 | @@ -1363,6 +1375,18 @@ func cmdbootstrap() { | 108 | @@ -1357,6 +1369,18 @@ func cmdbootstrap() { |
109 | "Use the -force flag to build anyway.\n", goos, goarch) | 109 | "Use the -force flag to build anyway.\n", goos, goarch) |
110 | } | 110 | } |
111 | 111 | ||
@@ -124,7 +124,7 @@ index adc9fd2..5fff592 100644 | |||
124 | // Set GOPATH to an internal directory. We shouldn't actually | 124 | // Set GOPATH to an internal directory. We shouldn't actually |
125 | // need to store files here, since the toolchain won't | 125 | // need to store files here, since the toolchain won't |
126 | // depend on modules outside of vendor directories, but if | 126 | // depend on modules outside of vendor directories, but if |
127 | @@ -1440,9 +1464,14 @@ func cmdbootstrap() { | 127 | @@ -1434,9 +1458,14 @@ func cmdbootstrap() { |
128 | xprintf("\n") | 128 | xprintf("\n") |
129 | } | 129 | } |
130 | 130 | ||
@@ -139,7 +139,7 @@ index adc9fd2..5fff592 100644 | |||
139 | goBootstrap := pathf("%s/go_bootstrap", tooldir) | 139 | goBootstrap := pathf("%s/go_bootstrap", tooldir) |
140 | if debug { | 140 | if debug { |
141 | run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") | 141 | run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") |
142 | @@ -1470,7 +1499,11 @@ func cmdbootstrap() { | 142 | @@ -1464,7 +1493,11 @@ func cmdbootstrap() { |
143 | xprintf("\n") | 143 | xprintf("\n") |
144 | } | 144 | } |
145 | xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") | 145 | xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") |
@@ -151,7 +151,7 @@ index adc9fd2..5fff592 100644 | |||
151 | // Now that cmd/go is in charge of the build process, enable GOEXPERIMENT. | 151 | // Now that cmd/go is in charge of the build process, enable GOEXPERIMENT. |
152 | os.Setenv("GOEXPERIMENT", goexperiment) | 152 | os.Setenv("GOEXPERIMENT", goexperiment) |
153 | // No need to enable PGO for toolchain2. | 153 | // No need to enable PGO for toolchain2. |
154 | @@ -1523,6 +1556,7 @@ func cmdbootstrap() { | 154 | @@ -1517,6 +1550,7 @@ func cmdbootstrap() { |
155 | os.Setenv("GOCACHE", oldgocache) | 155 | os.Setenv("GOCACHE", oldgocache) |
156 | } | 156 | } |
157 | 157 | ||
@@ -159,7 +159,7 @@ index adc9fd2..5fff592 100644 | |||
159 | if goos == oldgoos && goarch == oldgoarch { | 159 | if goos == oldgoos && goarch == oldgoarch { |
160 | // Common case - not setting up for cross-compilation. | 160 | // Common case - not setting up for cross-compilation. |
161 | timelog("build", "toolchain") | 161 | timelog("build", "toolchain") |
162 | @@ -1566,6 +1600,42 @@ func cmdbootstrap() { | 162 | @@ -1560,6 +1594,42 @@ func cmdbootstrap() { |
163 | checkNotStale(toolenv(), goBootstrap, toolchain...) | 163 | checkNotStale(toolenv(), goBootstrap, toolchain...) |
164 | copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) | 164 | copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) |
165 | } | 165 | } |
@@ -202,7 +202,7 @@ index adc9fd2..5fff592 100644 | |||
202 | 202 | ||
203 | // Check that there are no new files in $GOROOT/bin other than | 203 | // Check that there are no new files in $GOROOT/bin other than |
204 | // go and gofmt and $GOOS_$GOARCH (target bin when cross-compiling). | 204 | // go and gofmt and $GOOS_$GOARCH (target bin when cross-compiling). |
205 | @@ -1585,8 +1655,12 @@ func cmdbootstrap() { | 205 | @@ -1582,8 +1652,12 @@ func cmdbootstrap() { |
206 | } | 206 | } |
207 | } | 207 | } |
208 | 208 | ||
@@ -216,5 +216,5 @@ index adc9fd2..5fff592 100644 | |||
216 | if goos == "android" { | 216 | if goos == "android" { |
217 | // Make sure the exec wrapper will sync a fresh $GOROOT to the device. | 217 | // Make sure the exec wrapper will sync a fresh $GOROOT to the device. |
218 | -- | 218 | -- |
219 | 2.43.0 | 219 | 2.44.0 |
220 | 220 | ||