From 50104cc32a498f7517a51c8dc93106c51c7a54b4 Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 20 Apr 2011 15:44:41 +0200
Subject: Imported Upstream version 2011.03.07.1

---
 src/make.bash | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'src/make.bash')

diff --git a/src/make.bash b/src/make.bash
index 43c70a87b..d9ca40d42 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -61,29 +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
-	case "$i-$GOOS-$GOARCH" in
-	cmd/*-nacl-*)
-		;;
-	*)
-		# 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
-	esac
+	echo; echo; echo %%%% making $i %%%%; echo
+	gomake -C $i install
 done
 
 # Print post-install messages.
-- 
cgit v1.2.3