[51892] trunk/dports/_resources/port1.0/group/xcode-1.0.tcl

[toby at macports.org]

Revision: 51892
          http://trac.macports.org/changeset/51892
Author:   toby at macports.org
Date:     2009-06-05 17:19:12 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
Forward-compatibility with impending universal_sysroot removal.
Also remove xcode.universal.sdk setting.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/xcode-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/xcode-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/xcode-1.0.tcl	2009-06-06 00:16:27 UTC (rev 51891)
+++ trunk/dports/_resources/port1.0/group/xcode-1.0.tcl	2009-06-06 00:19:12 UTC (rev 51892)
@@ -65,12 +65,6 @@
 #   xcode.destroot.path      install path (INSTALL_PATH setting value).
 #   xcode.destroot.settings  additional settings passed to $xcodebuildcmd (in
 #                            the X=Y form)
-#   xcode.universal.settings settings passed to $xcodebuildcmd when the +universal
-#                            variant is selected. Defaults to ARCHS="${universal_archs}"
-#                            MACOSX_DEPLOYMENT_TARGET=${universal_target}.
-#   xcode.universal.sdk      sdk to use when the +universal variant is selected.
-#                            Defaults to ${universal_sysroot}. If set to the empty
-#                            list, no sdk option will be passed to xcodebuild.
 #
 #  Usual parameters:
 #   destroot            where to destroot the project.
@@ -119,11 +113,8 @@
 options xcode.destroot.settings
 default xcode.destroot.settings ""
 
-options xcode.universal.sdk
-default xcode.universal.sdk {${universal_sysroot}}
-
 # XXX: Needed to satisfy a check in portutil.tcl, remove when 1.8 is released.
-default xcode.universal.settings {}
+#default xcode.universal.settings {}
 
 namespace eval xcode {}
 
@@ -278,11 +269,11 @@
 
     if {[variant_isset universal]} {
         set xcode_build_args "$xcode_build_args ARCHS=\"${universal_archs}\""
-        if {"${xcode.universal.sdk}" != ""} {
+        if {[info exists universal_sysroot] && "${universal_sysroot}" != ""} {
             if {${os.major} >= 9} {
-                set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
+                set xcode_build_args "-sdk ${universal_sysroot} $xcode_build_args"
             } else {
-                set xcode_build_args "SDKROOT=\"${xcode.universal.sdk}\" $xcode_build_args"
+                set xcode_build_args "SDKROOT=\"${universal_sysroot}\" $xcode_build_args"
             }
         }
     }
@@ -328,11 +319,11 @@
 
     if {[variant_isset universal]} {
         set xcode_build_args "$xcode_build_args ARCHS=\"${universal_archs}\""
-        if {"${xcode.universal.sdk}" != ""} {
+        if {[info exists universal_sysroot] && "${universal_sysroot}" != ""} {
             if {${os.major} >= 9} {
-                set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
+                set xcode_build_args "-sdk ${universal_sysroot} $xcode_build_args"
             } else {
-                set xcode_build_args "SDKROOT=\"${xcode.universal.sdk}\" $xcode_build_args"
+                set xcode_build_args "SDKROOT=\"${universal_sysroot}\" $xcode_build_args"
             }
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090605/64adc107/attachment.html>