Ignore:
Timestamp:
Feb 19, 2012, 6:34:37 PM (5 years ago)
Author:
jmr@…
Message:

merge r90000 from trunk:

fix SDK paths for xcode 4.3

Location:
branches/release_2_0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/release_2_0

  • branches/release_2_0/base

  • branches/release_2_0/base/src/port1.0/portconfigure.tcl

    r82294 r90014  
    294294
    295295proc portconfigure::configure_get_sdkroot {} {
    296     global developer_dir macosx_deployment_target macosx_version os.arch os.platform
     296    global developer_dir macosx_deployment_target macosx_version xcodeversion os.arch os.platform
    297297    if {${os.platform} == "darwin" && ($macosx_deployment_target != $macosx_version
    298298        || (${os.arch} == "powerpc" && $macosx_version == "10.4" && [variant_exists universal] && [variant_isset universal]))} {
     299        if {[vercmp $xcodeversion 4.3] >= 0} {
     300            set sdks_dir "${developer_dir}/SDKs"
     301        } else {
     302            set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs"
     303        }
    299304        if {$macosx_deployment_target == "10.4"} {
    300             set sdk "${developer_dir}/SDKs/MacOSX10.4u.sdk"
    301         } else {
    302             set sdk "${developer_dir}/SDKs/MacOSX${macosx_deployment_target}.sdk"
     305            set sdk "${sdks_dir}/MacOSX10.4u.sdk"
     306        } else {
     307            set sdk "${sdks_dir}/MacOSX${macosx_deployment_target}.sdk"
    303308        }
    304309        if {[file exists $sdk]} {
Note: See TracChangeset for help on using the changeset viewer.