From 1374e308e2c06b49e2bd72d311c7762bf9c628ca Mon Sep 17 00:00:00 2001
From: thatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 14 Dec 2006 19:30:36 +0000
Subject: [PATCH] top level:

        Reviewed by Brady.

        * Makefile.shared: use $PIPESTATUS[0] and a sub-shell to exit with xcodebuild's exit status

WebKitTools:

        Reviewed by Brady.

        * Makefile.shared: use $PIPESTATUS[0] and a sub-shell to exit with xcodebuild's exit status



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18216 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 ChangeLog                   |  6 ++++++
 Makefile.shared             | 10 +++++-----
 WebKitTools/ChangeLog       |  6 ++++++
 WebKitTools/Makefile.shared | 10 +++++-----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69588e66c90e..617242893720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-14  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Brady.
+
+        * Makefile.shared: use $PIPESTATUS[0] and a sub-shell to exit with xcodebuild's exit status
+
 2006-12-13  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Brady and Anders.
diff --git a/Makefile.shared b/Makefile.shared
index 03404cb01fe5..df3389ca3b00 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,20 +1,20 @@
 XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
 
 all:
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 debug d development dev develop: force
 	../WebKitTools/Scripts/set-webkit-configuration --debug
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 release r deployment dep deploy: force
 	../WebKitTools/Scripts/set-webkit-configuration --release
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 universal u: force
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 clean:
-	xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv
+	( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 force: ;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ce8129ad13ac..840257c40ffa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-14  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Brady.
+
+        * Makefile.shared: use $PIPESTATUS[0] and a sub-shell to exit with xcodebuild's exit status
+
 2006-12-13  Zack Rusin  <zack@kde.org>
 
         Reviewed by rwlbuis
diff --git a/WebKitTools/Makefile.shared b/WebKitTools/Makefile.shared
index 0f8c148dbc0c..8a42f12a5dae 100644
--- a/WebKitTools/Makefile.shared
+++ b/WebKitTools/Makefile.shared
@@ -1,20 +1,20 @@
 XCODE_OPTIONS = `perl -I../Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
 
 all:
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 debug d development dev develop: force
 	../Scripts/set-webkit-configuration --debug
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 release r deployment dep deploy: force
 	../Scripts/set-webkit-configuration --release
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 universal u: force
-	xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386'
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 clean:
-	xcodebuild -alltargets clean $(XCODE_OPTIONS)
+	( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 force: ;
-- 
2.36.0