Ignore:
Timestamp:
Mar 4, 2009, 2:05:43 AM (11 years ago)
Author:
toby@…
Message:

simplify logic for detecting target/sdkroot, also work on versions other than 10.4/10.5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r46954 r47703  
    496496
    497497        if test "x$UNIVERSAL_TARGET" = "x"; then
    498             if [test -d /Developer/SDKs/MacOSX10.5.sdk]; then
    499                 UNIVERSAL_TARGET=10.5
    500                 UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
     498            UNIVERSAL_TARGET=${MACOSX_VERSION}
     499        fi
     500
     501        if test "x$UNIVERSAL_SYSROOT" = "x"; then
     502            if test "${MACOSX_VERSION}" = "10.4"; then
     503                UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}u.sdk
    501504            else
    502                 UNIVERSAL_TARGET=10.4
    503                 UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk
     505                UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}.sdk
    504506            fi
    505         else
    506             if test "x$UNIVERSAL_SYSROOT" = "x"; then
    507                 UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${UNIVERSAL_TARGET}.sdk
    508             fi
    509507        fi
    510508
    511509        if test "x$UNIVERSAL_ARCHS" = "x"; then
    512                 #UNIVERSAL_ARCHS="ppc ppc64 i386 x86_64"
    513                 UNIVERSAL_ARCHS="ppc i386"
     510            UNIVERSAL_ARCHS="ppc i386"
    514511        fi
    515512   
Note: See TracChangeset for help on using the changeset viewer.