diff options
Diffstat (limited to 'meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch')
-rw-r--r-- | meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch index 85e42f7660..5dd2621adc 100644 --- a/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 31ff609cc3d3bfcc2f2257fda1dbaafaec31eb0b Mon Sep 17 00:00:00 2001 | 1 | From 9f59e46991074d3e3c4d00f3971e62bfcd707167 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Kube <alexander.j.kube@gmail.com> | 2 | From: Alex Kube <alexander.j.kube@gmail.com> |
3 | Date: Wed, 23 Oct 2019 21:17:16 +0430 | 3 | Date: Wed, 23 Oct 2019 21:17:16 +0430 |
4 | Subject: [PATCH 4/9] make.bash: override CC when building dist and | 4 | Subject: [PATCH 4/9] make.bash: override CC when building dist and |
@@ -13,24 +13,25 @@ Matt Madison <matt@madison.systems>. | |||
13 | Upstream-Status: Inappropriate [OE specific] | 13 | Upstream-Status: Inappropriate [OE specific] |
14 | 14 | ||
15 | Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | 15 | Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> |
16 | Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> | ||
16 | --- | 17 | --- |
17 | src/make.bash | 4 ++-- | 18 | src/make.bash | 4 ++-- |
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
19 | 20 | ||
20 | diff --git a/src/make.bash b/src/make.bash | 21 | diff --git a/src/make.bash b/src/make.bash |
21 | index c07f39b..6ca7242 100755 | 22 | index 755b3b0..eddfc3c 100755 |
22 | --- a/src/make.bash | 23 | --- a/src/make.bash |
23 | +++ b/src/make.bash | 24 | +++ b/src/make.bash |
24 | @@ -194,7 +194,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then | 25 | @@ -198,7 +198,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then |
25 | exit 1 | 26 | exit 1 |
26 | fi | 27 | fi |
27 | rm -f cmd/dist/dist | 28 | rm -f cmd/dist/dist |
28 | -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off GOEXPERIMENT="" GOENV=off GOFLAGS="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist | 29 | -GOROOT="$GOROOT_BOOTSTRAP" nogoenv "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist |
29 | +CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off GOEXPERIMENT="" GOENV=off GOFLAGS="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist | 30 | +CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" nogoenv "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist |
30 | 31 | ||
31 | # -e doesn't propagate out of eval, so check success by hand. | 32 | # -e doesn't propagate out of eval, so check success by hand. |
32 | eval $(./cmd/dist/dist env -p || echo FAIL=true) | 33 | eval $(./cmd/dist/dist env -p || echo FAIL=true) |
33 | @@ -219,7 +219,7 @@ fi | 34 | @@ -223,7 +223,7 @@ fi |
34 | # Run dist bootstrap to complete make.bash. | 35 | # Run dist bootstrap to complete make.bash. |
35 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. | 36 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. |
36 | # Throw ours, built with the bootstrap toolchain, away after bootstrap. | 37 | # Throw ours, built with the bootstrap toolchain, away after bootstrap. |
@@ -40,5 +41,5 @@ index c07f39b..6ca7242 100755 | |||
40 | 41 | ||
41 | # DO NOT ADD ANY NEW CODE HERE. | 42 | # DO NOT ADD ANY NEW CODE HERE. |
42 | -- | 43 | -- |
43 | 2.30.2 | 44 | 2.43.0 |
44 | 45 | ||