diff options
Diffstat (limited to 'meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch')
| -rw-r--r-- | meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 2845d21382..a6937672f5 100644 --- a/meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.18/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch | |||
| @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
| 17 | src/make.bash | 4 ++-- | 17 | src/make.bash | 4 ++-- |
| 18 | 1 file changed, 2 insertions(+), 2 deletions(-) | 18 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/src/make.bash b/src/make.bash | ||
| 21 | index 7986125..dd67029 100755 | ||
| 22 | --- a/src/make.bash | 20 | --- a/src/make.bash |
| 23 | +++ b/src/make.bash | 21 | +++ b/src/make.bash |
| 24 | @@ -181,7 +181,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then | 22 | @@ -195,7 +195,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; |
| 25 | exit 1 | 23 | exit 1 |
| 26 | fi | 24 | fi |
| 27 | rm -f cmd/dist/dist | 25 | rm -f cmd/dist/dist |
| @@ -30,7 +28,7 @@ index 7986125..dd67029 100755 | |||
| 30 | 28 | ||
| 31 | # -e doesn't propagate out of eval, so check success by hand. | 29 | # -e doesn't propagate out of eval, so check success by hand. |
| 32 | eval $(./cmd/dist/dist env -p || echo FAIL=true) | 30 | eval $(./cmd/dist/dist env -p || echo FAIL=true) |
| 33 | @@ -206,7 +206,7 @@ fi | 31 | @@ -220,7 +220,7 @@ fi |
| 34 | # Run dist bootstrap to complete make.bash. | 32 | # Run dist bootstrap to complete make.bash. |
| 35 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. | 33 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. |
| 36 | # Throw ours, built with Go 1.4, away after bootstrap. | 34 | # Throw ours, built with Go 1.4, away after bootstrap. |
