From f05ef3ded52b98537c10efd0b15cd9612471524d Mon Sep 17 00:00:00 2001
|
From: Alex Kube <alexander.j.kube@gmail.com>
|
Date: Wed, 23 Oct 2019 21:17:16 +0430
|
Subject: [PATCH 5/9] make.bash: override CC when building dist and
|
go_bootstrap
|
|
for handling OE cross-canadian builds.
|
|
Adapted to Go 1.13 from patches originally submitted to
|
the meta/recipes-devtools/go tree by
|
Matt Madison <matt@madison.systems>.
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
|
---
|
src/make.bash | 4 ++--
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
--- a/src/make.bash
|
+++ b/src/make.bash
|
@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ];
|
exit 1
|
fi
|
rm -f cmd/dist/dist
|
-GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
|
+CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$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)
|
@@ -209,7 +209,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.
|
