[34313] trunk/base/src
afb at macports.org
afb at macports.org
Thu Feb 21 04:22:54 PST 2008
Revision: 34313
http://trac.macosforge.org/projects/macports/changeset/34313
Author: afb at macports.org
Date: 2008-02-21 04:22:53 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
move back to using 10.5 SDK on Leopard to avoid cross-compiling
Modified Paths:
--------------
trunk/base/src/macports1.0/macports.tcl
trunk/base/src/port1.0/portconfigure.tcl
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2008-02-21 12:17:26 UTC (rev 34312)
+++ trunk/base/src/macports1.0/macports.tcl 2008-02-21 12:22:53 UTC (rev 34313)
@@ -632,10 +632,18 @@
# Default mp universal options
if {![info exists macports::universal_target]} {
- set macports::universal_target "10.4"
+ if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
+ set macports::universal_target "10.5"
+ } else {
+ set macports::universal_target "10.4"
+ }
}
if {![info exists macports::universal_sysroot]} {
- set macports::universal_sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
+ if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
+ set macports::universal_sysroot "/Developer/SDKs/MacOSX10.5.sdk"
+ } else {
+ set macports::universal_sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
+ }
}
if {![info exists macports::universal_archs]} {
set macports::universal_archs {ppc i386}
Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl 2008-02-21 12:17:26 UTC (rev 34312)
+++ trunk/base/src/port1.0/portconfigure.tcl 2008-02-21 12:22:53 UTC (rev 34313)
@@ -103,7 +103,11 @@
default configure.pkg_config_path {}
# backwards compatibility for hardcoded ports
-set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
+if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
+ set sysroot "/Developer/SDKs/MacOSX10.5.sdk"
+} else {
+ set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
+}
options configure.universal_target configure.universal_sysroot configure.universal_archs configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags
default configure.universal_target {${universal_target}}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080221/642d7736/attachment.html
More information about the macports-changes
mailing list