summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Boelens <dannyb@enfocus.com>2013-02-21 10:16:43 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-22 17:29:47 (GMT)
commitb4212c94967526e6f3d718171ee775a2f0a8d699 (patch)
tree489761a4fe2e2fa4bf6bacf8e78b56fd8120e916
parent077a6573a880fccb013f3b96ac76ca9f7899a5a1 (diff)
downloadQt-b4212c94967526e6f3d718171ee775a2f0a8d699.zip
Qt-b4212c94967526e6f3d718171ee775a2f0a8d699.tar.gz
Qt-b4212c94967526e6f3d718171ee775a2f0a8d699.tar.bz2
Fix Mac OS X SDK checks for non-default Xcode setup.
Don't assume Xcode is installed in /Developer; it can be installed in a custom location. These checks don't exist in Qt 5 any more. Change-Id: I03ab68bb55b8e89694510a044404d29e480b0c5b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 1648710..15e83d7 100755
--- a/configure
+++ b/configure
@@ -3568,7 +3568,7 @@ fi
if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
# get the darwin version. 10.0.0 and up means snow leopard.
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
+ if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then
echo
echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
echo
@@ -7163,8 +7163,8 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
fi
# select Carbon when using the 10.4u SDK
-if [ "$PLATFORM_MAC" = "yes" ]; then
- if [ "TEST$CFG_SDK" = "TEST/Developer/SDKs/MacOSX10.4u.sdk/" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] && [ -n "$CFG_SDK" ]; then
+ if [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ]; then
echo "Carbon on";
CFG_MAC_COCOA="no";
CFG_MAC_CARBON="yes";