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

[toby at macports.org]

Revision: 51887
          http://trac.macports.org/changeset/51887
Author:   toby at macports.org
Date:     2009-06-05 17:04:06 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
Remove xcode.universal.settings - nothing uses it, and we should move away from universal-specific configuration.
Also, set MACOSX_DEPLOYMENT_TARGET during installation - not that it necessarily matters.

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-05 23:59:18 UTC (rev 51886)
+++ trunk/dports/_resources/port1.0/group/xcode-1.0.tcl	2009-06-06 00:04:06 UTC (rev 51887)
@@ -119,8 +119,6 @@
 options xcode.destroot.settings
 default xcode.destroot.settings ""
 
-options xcode.universal.settings
-default xcode.universal.settings {ARCHS=\"${universal_archs}\"}
 options xcode.universal.sdk
 default xcode.universal.sdk {${universal_sysroot}}
 
@@ -276,7 +274,7 @@
     }
 
     if {[variant_isset universal]} {
-        set xcode_build_args "$xcode_build_args ${xcode.universal.settings}"
+        set xcode_build_args "$xcode_build_args ARCHS=\"${universal_archs}\""
         if {"${xcode.universal.sdk}" != ""} {
             if {${os.major} >= 9} {
                 set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
@@ -319,8 +317,14 @@
                                         ${xcode.destroot.path} ${xcode.destroot.type}]
     set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
     
+    if {[variant_isset universal] && [info exists universal_target]} {
+        set xcode_build_args "$xcode_build_args MACOSX_DEPLOYMENT_TARGET=${universal_target}"
+    } else {
+        set xcode_build_args "$xcode_build_args MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}"
+    }
+
     if {[variant_isset universal]} {
-        set xcode_build_args "$xcode_build_args ${xcode.universal.settings}"
+        set xcode_build_args "$xcode_build_args ARCHS=\"${universal_archs}\""
         if {"${xcode.universal.sdk}" != ""} {
             if {${os.major} >= 9} {
                 set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090605/73ccb6f8/attachment.html>