| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 1bf15aa8fb773604b2524cfdab493fa4d8fa9285 Mon Sep 17 00:00:00 2001 |
| 2 | From: Matt Madison <matt@madison.systems> |
| 3 | Date: Sat, 17 Feb 2018 06:32:45 -0800 |
| 4 | Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap |
| 5 | |
| 6 | for handling OE cross-canadian builds. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE specific] |
| 9 | |
| 10 | Signed-off-by: Matt Madison <matt@madison.systems> |
| 11 | |
| 12 | --- |
| 13 | src/make.bash | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/src/make.bash b/src/make.bash |
| 17 | index 78882d9..25943d0 100755 |
| 18 | --- a/src/make.bash |
| 19 | +++ b/src/make.bash |
| 20 | @@ -163,7 +163,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then |
| 21 | exit 1 |
| 22 | fi |
| 23 | rm -f cmd/dist/dist |
| 24 | -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist |
| 25 | +CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist |
| 26 | |
| 27 | # -e doesn't propagate out of eval, so check success by hand. |
| 28 | eval $(./cmd/dist/dist env -p || echo FAIL=true) |
| 29 | @@ -194,7 +194,7 @@ fi |
| 30 | # Run dist bootstrap to complete make.bash. |
| 31 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. |
| 32 | # Throw ours, built with Go 1.4, away after bootstrap. |
| 33 | -./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" |
| 34 | +CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" |
| 35 | rm -f ./cmd/dist/dist |
| 36 | |
| 37 | # DO NOT ADD ANY NEW CODE HERE. |