summaryrefslogtreecommitdiffstats
path: root/tools/clang
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-16 01:42:30 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-16 01:42:30 +0000
commit95c4eebfd3a2d2529b21bbb32ce58e45273994ae (patch)
treef49b4d25cca7fbb4e45db0b99d2b63b094e137c9 /tools/clang
parentab6564e2f7387552f5e2cc2bae593df04f8f1bc0 (diff)
downloadchromium_src-95c4eebfd3a2d2529b21bbb32ce58e45273994ae.zip
chromium_src-95c4eebfd3a2d2529b21bbb32ce58e45273994ae.tar.gz
chromium_src-95c4eebfd3a2d2529b21bbb32ce58e45273994ae.tar.bz2
Don't let update.sh print a warning message about xcodebuild if GYP_GENERATORS=make.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8308004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
-rwxr-xr-xtools/clang/scripts/update.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 5ae8b2a..2353803 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -64,7 +64,8 @@ done
# http://crbug.com/96315
if [[ "${OS}" = "Darwin" ]] && xcodebuild -version | grep -q 'Xcode 3.2' ; then
XCONF=com.apple.Xcode
- if [ "$(defaults read "${XCONF}" EnablePredictiveCompilation)" != "0" ]; then
+ if [[ "${GYP_GENERATORS}" != "make" ]] && \
+ [ "$(defaults read "${XCONF}" EnablePredictiveCompilation)" != "0" ]; then
echo
echo " HEARKEN!"
echo "You're using Xcode3 and you have 'Predictive Compilation' enabled."