From 432b4f309b9d2c82c72a18b917cdccb4ec2bd89f Mon Sep 17 00:00:00 2001
From: Dave Cheney <dave@cheney.net>
Date: Tue, 1 Mar 2011 09:20:32 +1100
Subject: build: convert src/cmd to use make directly and simplify
 src/make.bash

R=adg, bsiegert, rsc
CC=golang-dev
https://golang.org/cl/4221047
---
 src/make.bash | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/make.bash')

diff --git a/src/make.bash b/src/make.bash
index 0cbf3becb4..d9ca40d427 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -61,24 +61,8 @@ bash "$GOROOT"/src/clean.bash
 # pkg builds libcgo and the Go programs in cmd.
 for i in lib9 libbio libmach cmd pkg
 do
-	# The ( ) here are to preserve the current directory
-	# for the next round despite the cd $i below.
-	# set -e does not apply to ( ) so we must explicitly
-	# test the exit status.
-	(
-		echo; echo; echo %%%% making $i %%%%; echo
-		cd "$GOROOT"/src/$i
-		case $i in
-		cmd)
-			bash make.bash
-			;;
-		pkg)
-			gomake install
-			;;
-		*)
-			gomake install
-		esac
-	)  || exit 1
+	echo; echo; echo %%%% making $i %%%%; echo
+	gomake -C $i install
 done
 
 # Print post-install messages.
-- 
cgit v1.3