osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make it detect command-line-toos-only installations. 

/usr/bin/xcodebuild is present, but appears not to work, if you have
only the command-line tools for Xcode 8 installed, not Xcode 8 itself.

Change-Id: I4a55e30f8afcc7e575e661d2b4ea944c967790ec
Reviewed-on: https://code.wireshark.org/review/17856
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-09-22 02:59:53 -07:00
parent dedf926540
commit 4e53f5d975
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
macosx-setup.sh
View File

@ -2341,15 +2341,13 @@ if [ "$QT_VERSION" ]; then
# We need Xcode, not just the command-line tools, installed to build
# Qt.
#
# XXX - is this sufficient to differentiate between "command-line
# tools installed" and "Xcode installed"? The old
# At least with Xcode 8, /usr/bin/xcodebuild --help fails if only
# the command-line tools are installed and succeeds if Xcode is
# installed.
#
# 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
if /usr/bin/xcodebuild -help >/dev/null 2>&1; then
:
else
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