[102269] trunk/base/src/port1.0/portconfigure.tcl
jeremyhu at macports.org
jeremyhu at macports.org
Tue Jan 29 14:55:34 PST 2013
Revision: 102269
https://trac.macports.org/changeset/102269
Author: jeremyhu at macports.org
Date: 2013-01-29 14:55:34 -0800 (Tue, 29 Jan 2013)
Log Message:
-----------
Adjust default compiler options
Fallback to clang last on Leopard and Tiger because it doesn't handle ppc as well
Add fallbacks to more recent clang, llvm-gcc, and gcc on SL before using gcc-4.0
Add a newer clang and gcc from our ports as fallbacks for earlier XCode 4.x releases
Modified Paths:
--------------
trunk/base/src/port1.0/portconfigure.tcl
Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl 2013-01-29 22:50:41 UTC (rev 102268)
+++ trunk/base/src/port1.0/portconfigure.tcl 2013-01-29 22:55:34 UTC (rev 102269)
@@ -449,23 +449,23 @@
} elseif {$xcodeversion == "none" || $xcodeversion == ""} {
return {cc}
} elseif {[vercmp $xcodeversion 4.6] >= 0} {
- return {clang macports-llvm-gcc-4.2 apple-gcc-4.2}
+ return {clang macports-llvm-gcc-4.2 apple-gcc-4.2 macports-clang-3.2}
} elseif {[vercmp $xcodeversion 4.2] >= 0} {
- return {clang llvm-gcc-4.2 apple-gcc-4.2}
+ return {clang llvm-gcc-4.2 apple-gcc-4.2 macports-clang-3.2}
} elseif {[vercmp $xcodeversion 4.0] >= 0} {
- return {llvm-gcc-4.2 clang gcc-4.2}
+ return {llvm-gcc-4.2 clang gcc-4.2 macports-clang-3.2 apple-gcc-4.2}
} elseif {[vercmp $xcodeversion 3.2] >= 0} {
if {$macosx_deployment_target == "10.4"} {
# It's not the deployment target that is the issue, it's the
# 10.4u SDK which base chooses if the deployment_target is set
return {gcc-4.0}
} else {
- return {gcc-4.2 clang llvm-gcc-4.2 gcc-4.0}
+ return {gcc-4.2 clang llvm-gcc-4.2 macports-clang-3.2 macports-llvm-gcc-4.2 apple-gcc-4.2 gcc-4.0}
}
} elseif {[vercmp $xcodeversion 3.0] >= 0} {
- return {gcc-4.2 apple-gcc-4.2 macports-clang-3.0 gcc-4.0}
+ return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.2}
} else {
- return {gcc-4.0 apple-gcc-4.2 macports-clang-3.0 gcc-3.3}
+ return {gcc-4.0 apple-gcc-4.2 gcc-3.3 macports-clang-3.2}
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130129/8b72fde5/attachment-0001.html>
More information about the macports-changes
mailing list