summaryrefslogtreecommitdiff
path: root/macosx-setup.sh
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-09-22 13:54:13 -0700
committerGuy Harris <guy@alum.mit.edu>2016-09-22 20:54:40 +0000
commit76d97c39c9be04ff2ed599cc3d15b7fddbf080f6 (patch)
treeee7cfed69c1adab96d4ec4db0ec3da4d22d38598 /macosx-setup.sh
parent14fcb720ddac2bd91f5306d20452908e37d168e8 (diff)
downloadwireshark-76d97c39c9be04ff2ed599cc3d15b7fddbf080f6.tar.gz
Fix the "do we have Xcode?" test for older versions of Xcode.
Change-Id: I35853b6cb2985bf9bc36175ec8085929e66db349 Reviewed-on: https://code.wireshark.org/review/17872 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'macosx-setup.sh')
-rwxr-xr-xmacosx-setup.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh
index 309256b126..d2939f45a2 100755
--- a/macosx-setup.sh
+++ b/macosx-setup.sh
@@ -2343,9 +2343,11 @@ if [ "$QT_VERSION" ]; then
#
# At least with Xcode 8, /usr/bin/xcodebuild --help fails if only
# the command-line tools are installed and succeeds if Xcode is
- # installed.
+ # installed. Unfortunately, it fails *with* Xcode 3, but
+ # /usr/bin/xcodebuild -version works with that and with Xcode 8.
+ # Hopefully it fails with only the command-line tools installed.
#
- if /usr/bin/xcodebuild -help >/dev/null 2>&1; then
+ if /usr/bin/xcodebuild -version >/dev/null 2>&1; then
:
else
echo "Please install Xcode first (should be available on DVD or from the Mac App Store)."