Changeset 51892


Ignore:
Timestamp:
Jun 6, 2009, 12:19:12 AM (11 years ago)
Author:
toby@…
Message:

Forward-compatibility with impending universal_sysroot removal.
Also remove xcode.universal.sdk setting.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/xcode-1.0.tcl

    r51888 r51892  
    6666#   xcode.destroot.settings  additional settings passed to $xcodebuildcmd (in
    6767#                            the X=Y form)
    68 #   xcode.universal.settings settings passed to $xcodebuildcmd when the +universal
    69 #                            variant is selected. Defaults to ARCHS="${universal_archs}"
    70 #                            MACOSX_DEPLOYMENT_TARGET=${universal_target}.
    71 #   xcode.universal.sdk      sdk to use when the +universal variant is selected.
    72 #                            Defaults to ${universal_sysroot}. If set to the empty
    73 #                            list, no sdk option will be passed to xcodebuild.
    7468#
    7569#  Usual parameters:
     
    120114default xcode.destroot.settings ""
    121115
    122 options xcode.universal.sdk
    123 default xcode.universal.sdk {${universal_sysroot}}
    124 
    125116# XXX: Needed to satisfy a check in portutil.tcl, remove when 1.8 is released.
    126 default xcode.universal.settings {}
     117#default xcode.universal.settings {}
    127118
    128119namespace eval xcode {}
     
    279270    if {[variant_isset universal]} {
    280271        set xcode_build_args "$xcode_build_args ARCHS=\"${universal_archs}\""
    281         if {"${xcode.universal.sdk}" != ""} {
     272        if {[info exists universal_sysroot] && "${universal_sysroot}" != ""} {
    282273            if {${os.major} >= 9} {
    283                 set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
     274                set xcode_build_args "-sdk ${universal_sysroot} $xcode_build_args"
    284275            } else {
    285                 set xcode_build_args "SDKROOT=\"${xcode.universal.sdk}\" $xcode_build_args"
     276                set xcode_build_args "SDKROOT=\"${universal_sysroot}\" $xcode_build_args"
    286277            }
    287278        }
     
    329320    if {[variant_isset universal]} {
    330321        set xcode_build_args "$xcode_build_args ARCHS=\"${universal_archs}\""
    331         if {"${xcode.universal.sdk}" != ""} {
     322        if {[info exists universal_sysroot] && "${universal_sysroot}" != ""} {
    332323            if {${os.major} >= 9} {
    333                 set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
     324                set xcode_build_args "-sdk ${universal_sysroot} $xcode_build_args"
    334325            } else {
    335                 set xcode_build_args "SDKROOT=\"${xcode.universal.sdk}\" $xcode_build_args"
     326                set xcode_build_args "SDKROOT=\"${universal_sysroot}\" $xcode_build_args"
    336327            }
    337328        }
Note: See TracChangeset for help on using the changeset viewer.