Ignore:
Timestamp:
Jun 14, 2009, 7:03:40 AM (11 years ago)
Author:
toby@…
Message:

Merge universal-sanity branch. Changes are relatively straightforward, although somewhat risky:

  • remove universal_sysroot/universal_target options
  • hardcode the 10.4u SDK for Tiger/PPC, only platform that needs it
Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base

  • trunk/base/aclocal.m4

    r51849 r52324  
    491491AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
    492492
    493     AC_ARG_WITH(universal-target,[AS_HELP_STRING([--with-universal-target=MDT],[Universal MACOSX_DEPLOYMENT_TARGET version])], UNIVERSAL_TARGET=${withval})
    494     AC_ARG_WITH(universal-sysroot,[AS_HELP_STRING([--with-universal-sysroot=SDK],[Universal SDK sysroot (with complete path)])], UNIVERSAL_SYSROOT=${withval})
    495493    AC_ARG_WITH(universal-archs,[AS_HELP_STRING([--with-universal-archs="CPU"],[Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
    496 
    497         MACOSX_MAJOR_VERSION=`$SW_VERS -productVersion | cut -f-2 -d.`
    498 
    499         if test "x$UNIVERSAL_TARGET" = "x"; then
    500             UNIVERSAL_TARGET=${MACOSX_MAJOR_VERSION}
    501         fi
    502 
    503         if test "x$UNIVERSAL_SYSROOT" = "x"; then
    504             if test "${MACOSX_MAJOR_VERSION}" = "10.4"; then
    505                 UNIVERSAL_SYSROOT=${DEVELOPER_DIR}/SDKs/MacOSX${MACOSX_MAJOR_VERSION}u.sdk
    506             else
    507                 UNIVERSAL_SYSROOT=${DEVELOPER_DIR}/SDKs/MacOSX${MACOSX_MAJOR_VERSION}.sdk
    508             fi
    509         fi
    510494
    511495        if test "x$UNIVERSAL_ARCHS" = "x"; then
    512496            UNIVERSAL_ARCHS="ppc i386"
    513497        fi
    514    
    515     AC_MSG_CHECKING([for Universal MDT version])
    516     AC_MSG_RESULT([$UNIVERSAL_TARGET])
    517     AC_SUBST(UNIVERSAL_TARGET)
    518 
    519     AC_MSG_CHECKING([for Universal SDK sysroot])
    520     AC_MSG_RESULT([$UNIVERSAL_SYSROOT])
    521     AC_SUBST(UNIVERSAL_SYSROOT)
    522498
    523499    AC_MSG_CHECKING([for Universal CPU architectures])
Note: See TracChangeset for help on using the changeset viewer.