5a84c902e7
This builds fine for f19, f20 and el6 too, and should be tested now that go.tools is packaged bz#1022983
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
diff -r 7326da92ff4d src/make.bash
|
|
--- a/src/make.bash Mon Dec 02 09:06:41 2013 +1100
|
|
+++ b/src/make.bash Tue Dec 03 15:29:09 2013 -0500
|
|
@@ -145,7 +145,7 @@
|
|
if [ "$1" = "--no-clean" ]; then
|
|
buildall=""
|
|
fi
|
|
-./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap
|
|
+./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -vv # builds go_bootstrap
|
|
# Delay move of dist tool to now, because bootstrap may clear tool directory.
|
|
mv cmd/dist/dist "$GOTOOLDIR"/dist
|
|
"$GOTOOLDIR"/go_bootstrap clean -i std
|
|
@@ -154,12 +154,12 @@
|
|
if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOHOSTOS" != "$GOOS" ]; then
|
|
echo "# Building packages and commands for host, $GOHOSTOS/$GOHOSTARCH."
|
|
GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \
|
|
- "$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std
|
|
+ "$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std
|
|
echo
|
|
fi
|
|
|
|
echo "# Building packages and commands for $GOOS/$GOARCH."
|
|
-"$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std
|
|
+"$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std
|
|
echo
|
|
|
|
rm -f "$GOTOOLDIR"/go_bootstrap
|