aboutsummaryrefslogtreecommitdiff
path: root/src/make.bash
diff options
context:
space:
mode:
Diffstat (limited to 'src/make.bash')
-rwxr-xr-xsrc/make.bash20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/make.bash b/src/make.bash
index 83c1db4f48..3546c5d2be 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -85,10 +85,24 @@ do
done
echo; echo; echo %%%% making runtime generated files %%%%; echo
-(cd "$GOROOT"/src/pkg/runtime; ./autogen.sh) || exit 1
-echo; echo; echo %%%% making pkg %%%%; echo
-gomake -C pkg install
+(
+ cd "$GOROOT"/src/pkg/runtime
+ ./autogen.sh
+ make install # copy runtime.h to pkg directory
+) || exit 1
+
+if $USE_GO_TOOL; then
+ echo
+ echo '# Building go command from bootstrap script.'
+ ./buildscript_${GOOS}_$GOARCH.sh
+
+ echo '# Building Go code.'
+ GOPATH="" go install -a all
+else
+ echo; echo; echo %%%% making pkg %%%%; echo
+ gomake -C pkg install
+fi
# Print post-install messages.
# Implemented as a function so that all.bash can repeat the output