5767354120
Workaround build failure on s390x
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
diff -up go/src/make.bash.verbose go/src/make.bash
|
|
--- go/src/make.bash.verbose 2017-07-11 12:00:09.513553508 +0200
|
|
+++ go/src/make.bash 2017-07-11 12:01:25.288245720 +0200
|
|
@@ -167,7 +167,7 @@ if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOH
|
|
# CC_FOR_TARGET is recorded as the default compiler for the go tool. When building for the host, however,
|
|
# use the host compiler, CC, from `cmd/dist/dist env` instead.
|
|
CC=$CC GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \
|
|
- "$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std cmd
|
|
+ "$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std cmd
|
|
echo
|
|
fi
|
|
|
|
@@ -175,7 +175,7 @@ echo "##### Building packages and comman
|
|
|
|
old_bin_files=$(cd $GOROOT/bin && echo *)
|
|
|
|
-CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std cmd
|
|
+CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std cmd
|
|
|
|
# Check that there are no new files in $GOROOT/bin other than go and gofmt
|
|
# and $GOOS_$GOARCH (a directory used when cross-compiling).
|