diff options
| author | Danny Boelens <dannyb@enfocus.com> | 2013-02-21 10:16:43 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 17:29:47 (GMT) |
| commit | b4212c94967526e6f3d718171ee775a2f0a8d699 (patch) | |
| tree | 489761a4fe2e2fa4bf6bacf8e78b56fd8120e916 /configure | |
| parent | 077a6573a880fccb013f3b96ac76ca9f7899a5a1 (diff) | |
| download | Qt-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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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"; |