Ticket #30041: supported_compilers.patch

src/port1.0/portconfigure.tcl

@@ -183 +183 @@
 default configure.f90           {[portconfigure::configure_get_compiler f90]}
 default configure.fc            {[portconfigure::configure_get_compiler fc]}
 default configure.javac         {[portconfigure::configure_get_compiler javac]}
-default configure.compiler      {[portconfigure::configure_get_default_compiler]}
+default configure.compiler      {[portconfigure::configure_choose_supported_compilers [portconfigure::configure_get_default_compiler]]}
 
 set_ui_prefix
 
@@ -233 +233 @@
     }
 }
 
+# internal function find known compilers
+proc portconfigure::find_known_compilers default {
+    set compiler_names {}
+    lappend $compiler_names cc gcc gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-3.3 apple-gcc-4.0 apple-gcc-4.2
+    lappend $compiler_names macports-gcc-4.0 macports-gcc-4.1 macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
+    lappend $compiler_names llvm-gcc-4.2 clang macports-llvm-gcc-4.2 macports-clang
+
+    set compiler_binaries {}
+    lappend $compiler_binaries cc objc cxx cpp fc f77 f90
+
+    set found_compilers {}
+    ## assume the default compiler exists, search for the rest
+    #lappend $found_compilers [portconfigure::configure_get_default_compiler]
+
+    # check for any binary from each compiler
+    foreach compiler $compiler_names {
+        foreach binary $compiler_binaries {
+            set test_compiler [portconfigure::configure_get_compiler $binary $compiler]
+            if {[file executable $test_compiler] && [lsearch -exact $found_compilers $compiler] == -1} {
+                lappend found_compilers $compiler
+                ui_debug "Found $compiler ($test_compiler)"
+                break
+            }
+        }
+    }
+
+    return $found_compilers
+}
+
+# internal function to choose the default configure.compiler
+proc portconfigure::choose_supported_compilers {compilers} {
+
+    # if not set, any compiler will work
+    global supported_compilers
+    if {$supported_compilers == ""} {
+        return $compilers
+    }
+
+    # if set, thin the available set
+    set ret {}
+    foreach compiler $compilers {
+        if {[lsearch -exact $supported_compilers $compiler] != -1]} {
+            if {[lsearch -exact $ret $add_compiler] == -1} {
+                lappend $ret $add_compiler
+            }
+        }
+    }
+
+    return $ret
+}
+
 # internal function to choose the default configure.build_arch and
 # configure.universal_archs based on supported_archs and build_arch or
 # universal_archs
@@ -368 +419 @@
 }
 
 # internal function to find correct compilers
-proc portconfigure::configure_get_compiler {type} {
+proc portconfigure::configure_get_compiler {type} {find_this_compiler} {
     global configure.compiler prefix developer_dir
     set ret ""
-    switch -exact ${configure.compiler} {
+
+    if {$find_this_compiler == ""} {
+        set compiler ${configure.compiler}
+    }
+
+    switch -exact ${find_this_compiler} {
         cc {
             switch -exact ${type} {
                 cc   { set ret /usr/bin/cc }