1*4882a593SmuzhiyunFrom 153e2dda6103fd9dd871be4bb495a8da5328301e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alex Kube <alexander.j.kube@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 23 Oct 2019 21:17:16 +0430 4*4882a593SmuzhiyunSubject: [PATCH] make.bash: override CC when building dist and go_bootstrap 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunfor handling OE cross-canadian builds. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunAdapted to Go 1.13 from patches originally submitted to 9*4882a593Smuzhiyunthe meta/recipes-devtools/go tree by 10*4882a593SmuzhiyunMatt Madison <matt@madison.systems>. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunUpstream-Status: Inappropriate [OE specific] 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Alexander J Kube <alexander.j.kube@gmail.com> 15*4882a593Smuzhiyun 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun src/make.bash | 4 ++-- 18*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/src/make.bash b/src/make.bash 21*4882a593Smuzhiyunindex 7986125..dd67029 100755 22*4882a593Smuzhiyun--- a/src/make.bash 23*4882a593Smuzhiyun+++ b/src/make.bash 24*4882a593Smuzhiyun@@ -181,7 +181,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then 25*4882a593Smuzhiyun exit 1 26*4882a593Smuzhiyun fi 27*4882a593Smuzhiyun rm -f cmd/dist/dist 28*4882a593Smuzhiyun-GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist 29*4882a593Smuzhiyun+CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun # -e doesn't propagate out of eval, so check success by hand. 32*4882a593Smuzhiyun eval $(./cmd/dist/dist env -p || echo FAIL=true) 33*4882a593Smuzhiyun@@ -206,7 +206,7 @@ fi 34*4882a593Smuzhiyun # Run dist bootstrap to complete make.bash. 35*4882a593Smuzhiyun # Bootstrap installs a proper cmd/dist, built with the new toolchain. 36*4882a593Smuzhiyun # Throw ours, built with Go 1.4, away after bootstrap. 37*4882a593Smuzhiyun-./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" 38*4882a593Smuzhiyun+CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" 39*4882a593Smuzhiyun rm -f ./cmd/dist/dist 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun # DO NOT ADD ANY NEW CODE HERE. 42