diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-09-14 17:05:26 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-09-15 00:06:53 +0000 |
| commit | 3d7524c206e7e6630c29c154b5a66844872ed889 (patch) | |
| tree | 4ad573ce888d55d7e199f4f7fcf7b522c1774162 /macosx-setup.sh | |
| parent | 057b6bbd2e33afea4dc00accadabe89282d7f2f5 (diff) | |
| download | wireshark-3d7524c206e7e6630c29c154b5a66844872ed889.tar.gz | |
Fix a test to work with Xcode 8.
(Hopefully it still does what it's supposed to; I don't have any
machine, real or virtual, that has the command-line tools installed
without Xcode being installed on which to test it.)
Change-Id: I0ce8ce4f8532fcc6ab121641dde238180dfa69ce
Reviewed-on: https://code.wireshark.org/review/17704
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 7b31d949e3..599b93bfcf 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -2346,7 +2346,15 @@ if [ "$QT_VERSION" ]; then # We need Xcode, not just the command-line tools, installed to build # Qt. # - if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then + # XXX - is this sufficient to differentiate between "command-line + # tools installed" and "Xcode installed"? The old + # + # if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1 + # + # test did *not* work with Xcode 8 - it thought you didn't have + # Xcode installed even if you have Xcode 8 installed. + # + if [ ! -x /usr/bin/xcodebuild ]; then echo "Please install Xcode first (should be available on DVD or from http://developer.apple.com/xcode/index.php)." echo "The command-line build tools are not sufficient to build Qt." exit 1 |