| From 16124d84648f4dfdfa4738c5660b5400b30bf9da Mon Sep 17 00:00:00 2001 |
| From: Matt Madison <matt@madison.systems> |
| Date: Sat, 17 Feb 2018 06:32:45 -0800 |
| Subject: [PATCH 5/9] make.bash: override CC when building dist and |
| go_bootstrap |
| |
| for handling OE cross-canadian builds. |
| |
| Upstream-Status: Inappropriate [OE specific] |
| |
| Signed-off-by: Matt Madison <matt@madison.systems> |
| --- |
| src/make.bash | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/src/make.bash b/src/make.bash |
| index 93a5c43d11..3a63682bc4 100755 |
| --- a/src/make.bash |
| +++ b/src/make.bash |
| @@ -162,7 +162,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then |
| exit 1 |
| fi |
| rm -f cmd/dist/dist |
| -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist |
| +CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist |
| |
| # -e doesn't propagate out of eval, so check success by hand. |
| eval $(./cmd/dist/dist env -p || echo FAIL=true) |
| @@ -193,7 +193,7 @@ fi |
| # Run dist bootstrap to complete make.bash. |
| # Bootstrap installs a proper cmd/dist, built with the new toolchain. |
| # Throw ours, built with Go 1.4, away after bootstrap. |
| -./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" |
| +CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" |
| rm -f ./cmd/dist/dist |
| |
| # DO NOT ADD ANY NEW CODE HERE. |
| -- |
| 2.14.1 |
| |