Support go 1.5
The go compiler and linker changed in v1.5 -- to 'go tool compile' and
'go tool link' instead of 6g and 6l. Move the selection logic to
bootstrap.bash, and have it use compile/link if 6g/6l are missing. This
way the build.ninja.in will continue working with either go 1.4 or 1.5.
Travis and the test suite will fail under 1.5, since the build.ninja.in
is still generated with 1.4, and the function names in the comments
differ between 1.4 and 1.5.
diff --git a/bootstrap.bash b/bootstrap.bash
index d474cc4..ff60e21 100755
--- a/bootstrap.bash
+++ b/bootstrap.bash
@@ -59,6 +59,21 @@
# If RUN_TESTS is set, behave like -t was passed in as an option.
[ ! -z "$RUN_TESTS" ] && EXTRA_ARGS="$EXTRA_ARGS -t"
+GOTOOLDIR="$GOROOT/pkg/tool/${GOOS}_$GOARCH"
+GOCOMPILE="$GOTOOLDIR/${GOCHAR}g"
+GOLINK="$GOTOOLDIR/${GOCHAR}l"
+
+if [ ! -f $GOCOMPILE ]; then
+ GOCOMPILE="$GOTOOLDIR/compile"
+fi
+if [ ! -f $GOLINK ]; then
+ GOLINK="$GOTOOLDIR/link"
+fi
+if [[ ! -f $GOCOMPILE || ! -f $GOLINK ]]; then
+ echo "Cannot find go tools under $GOROOT"
+ exit 1
+fi
+
usage() {
echo "Usage of ${BOOTSTRAP}:"
echo " -h: print a help message and exit"
@@ -108,9 +123,8 @@
sed -e "s|@@SrcDir@@|$SRCDIR|g" \
-e "s|@@BuildDir@@|$BUILDDIR|g" \
-e "s|@@GoRoot@@|$GOROOT|g" \
- -e "s|@@GoOS@@|$GOOS|g" \
- -e "s|@@GoArch@@|$GOARCH|g" \
- -e "s|@@GoChar@@|$GOCHAR|g" \
+ -e "s|@@GoCompile@@|$GOCOMPILE|g" \
+ -e "s|@@GoLink@@|$GOLINK|g" \
-e "s|@@Bootstrap@@|$BOOTSTRAP|g" \
-e "s|@@BootstrapManifest@@|$BOOTSTRAP_MANIFEST|g" \
$IN > $BUILDDIR/build.ninja