Ticket #41554: Portfile-gsl-optimize.diff

Portfile

@@ -56 +56 @@
     }
 }
 
-variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 description "Use GCC 4.3 for compilation of GSL" {
+variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 mpclang33 description "Use GCC 4.3 for compilation of GSL" {
     configure.compiler          macports-gcc-4.3
 }
 
-variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 description "Use GCC 4.4 for compilation of GSL" {
+variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 mpclang33 description "Use GCC 4.4 for compilation of GSL" {
     configure.compiler          macports-gcc-4.4
 }
 
-variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 description "Use GCC 4.5 for compilation of GSL" {
+variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 mpclang33 description "Use GCC 4.5 for compilation of GSL" {
     configure.compiler          macports-gcc-4.5
 }
 
-variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 description "Use GCC 4.6 for compilation of GSL" {
+variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 mpclang33 description "Use GCC 4.6 for compilation of GSL" {
     configure.compiler          macports-gcc-4.6
 }
 
-variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 description "Use GCC 4.7 for compilation of GSL" {
+variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 mpclang33 description "Use GCC 4.7 for compilation of GSL" {
     configure.compiler          macports-gcc-4.7
 }
 
-variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 description "Use GCC 4.8 for compilation of GSL" {
+variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 mpclang33 description "Use GCC 4.8 for compilation of GSL" {
     configure.compiler          macports-gcc-4.8
 }
 
+variant mpclang33 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 description "Use clang 3.3 for compilation of GSL" {
+    configure.compiler          macports-clang-3.3
+}
+
 variant optimize description "Provide further optimization options (depending on compiler used)" {
     configure.cflags-append     "-ftree-vectorize -O3"
 }
 
 platform darwin i386 {
     if { [variant_isset optimize] } {
-        if { [variant_isset gcc43] } {
+        if { [variant_isset mpclang33] } {
+            configure.cflags-append "-march=native"
+        } elseif { [variant_isset gcc43] } {
             configure.cflags-append "-march=native"
-        } elseif { [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] } {
+        } elseif { [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || 
+                   [variant_isset gcc47] || [variant_isset gcc48] } {
             # Currently, gcc cannot compile AVX instructions on OSX
             configure.cflags-append "-march=native -mno-avx"
+        } else {
+            #Default compiler. Check if clang is new enough
+            if { [string match "clang" ${configure.compiler}] &&
+                 [vercmp $xcodeversion 5.0] >= 0 } {
+                configure.cflags-append "-march=native"
+            } else {
+                configure.cflags-append "-march=native -mnoavx"
+            }
         }
     }
 }