[90000] trunk/base/src/port1.0/portconfigure.tcl

[jmr at macports.org]

Revision: 90000
          http://trac.macports.org/changeset/90000
Author:   jmr at macports.org
Date:     2012-02-19 06:30:49 -0800 (Sun, 19 Feb 2012)
Log Message:
-----------
fix SDK paths for xcode 4.3

Modified Paths:
--------------
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2012-02-19 14:26:04 UTC (rev 89999)
+++ trunk/base/src/port1.0/portconfigure.tcl	2012-02-19 14:30:49 UTC (rev 90000)
@@ -302,13 +302,18 @@
 }
 
 proc portconfigure::configure_get_sdkroot {} {
-    global developer_dir macosx_deployment_target macosx_version os.arch os.platform
+    global developer_dir macosx_deployment_target macosx_version xcodeversion os.arch os.platform
     if {${os.platform} == "darwin" && ($macosx_deployment_target != $macosx_version
         || (${os.arch} == "powerpc" && $macosx_version == "10.4" && [variant_exists universal] && [variant_isset universal]))} {
+        if {[vercmp $xcodeversion 4.3] >= 0} {
+            set sdks_dir "${developer_dir}/SDKs"
+        } else {
+            set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs"
+        }
         if {$macosx_deployment_target == "10.4"} {
-            set sdk "${developer_dir}/SDKs/MacOSX10.4u.sdk"
+            set sdk "${sdks_dir}/MacOSX10.4u.sdk"
         } else {
-            set sdk "${developer_dir}/SDKs/MacOSX${macosx_deployment_target}.sdk"
+            set sdk "${sdks_dir}/MacOSX${macosx_deployment_target}.sdk"
         }
         if {[file exists $sdk]} {
             return $sdk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120219/f9b98407/attachment.html>