Revision
124832
Author
jeremyhu@macports.org
Date
2014-08-28 11:26:33 -0700 (Thu, 28 Aug 2014)

Log Message

ld64: Default to llvm35 on Mavericks and later

Modified Paths

Diff

Modified: trunk/dports/devel/ld64/Portfile (124831 => 124832)


--- trunk/dports/devel/ld64/Portfile	2014-08-28 18:17:57 UTC (rev 124831)
+++ trunk/dports/devel/ld64/Portfile	2014-08-28 18:26:33 UTC (rev 124832)
@@ -32,11 +32,15 @@
 # dependency cycle as llvm requires apple-gcc42 and ld64 to build correctly.  Users
 # wanting LTO support in ld64 on Tiger can install the +llvm variant after llvm
 # has been installed.
-if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ${os.major} >= 9} {
-    default_variants +llvm34
+if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36]} {
+    if {${os.major} >= 13} {
+        default_variants +llvm35
+    } elseif {${os.major} >= 9} {
+        default_variants +llvm34
+    }
 
     # Leopard/powerpc has the option to not be LTO
-    if {![variant_isset llvm34] && ${os.arch} ne "powerpc"} {
+    if {![variant_isset llvm34] && ![variant_isset llvm35] && ${os.arch} ne "powerpc" && ${os.major} >= 9} {
         ui_error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
         return -code error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
     }