Revision: 86719 http://trac.macports.org/changeset/86719 Author: jeremyhu@macports.org Date: 2011-11-01 15:38:27 -0700 (Tue, 01 Nov 2011) Log Message: ----------- Add support for versioned clang and the port selected gcc in configure.compiler Modified Paths: -------------- trunk/base/src/port1.0/portconfigure.tcl Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2011-11-01 22:38:17 UTC (rev 86718) +++ trunk/base/src/port1.0/portconfigure.tcl 2011-11-01 22:38:27 UTC (rev 86719) @@ -203,6 +203,7 @@ clang { set name "Mac OS X clang" } apple-gcc-4.0 { set name "MacPorts Apple gcc 4.0" } apple-gcc-4.2 { set name "MacPorts Apple gcc 4.2" } + macports-gcc { set name "MacPorts gcc (port select)" } macports-gcc-4.0 { set name "MacPorts gcc 4.0" } macports-gcc-4.1 { set name "MacPorts gcc 4.1" } macports-gcc-4.2 { set name "MacPorts gcc 4.2" } @@ -211,7 +212,10 @@ macports-gcc-4.5 { set name "MacPorts gcc 4.5" } macports-gcc-4.6 { set name "MacPorts gcc 4.6" } macports-llvm-gcc-4.2 { set name "MacPorts llvm-gcc 4.2" } - macports-clang { set name "MacPorts clang" } + macports-clang { set name "MacPorts clang (port select)" } + macports-clang-2.9 { set name "MacPorts clang 2.9" } + macports-clang-3.0 { set name "MacPorts clang 3.0" } + macports-clang-3.1 { set name "MacPorts clang 3.1" } default { return -code error "Invalid value for configure.compiler" } } ui_debug "Using compiler '$name'" @@ -447,6 +451,17 @@ cxx { set ret ${prefix}/bin/g++-apple-4.2 } } } + macports-gcc { + switch -exact ${type} { + cc { set ret ${prefix}/bin/gcc } + objc { set ret ${prefix}/bin/gcc } + cxx { set ret ${prefix}/bin/g++ } + cpp { set ret ${prefix}/bin/cpp } + fc { set ret ${prefix}/bin/gfortran } + f77 { set ret ${prefix}/bin/gfortran } + f90 { set ret ${prefix}/bin/gfortran } + } + } macports-gcc-4.0 { switch -exact ${type} { cc { set ret ${prefix}/bin/gcc-mp-4.0 } @@ -542,6 +557,27 @@ cxx { set ret ${prefix}/bin/clang++ } } } + macports-clang-2.9 { + switch -exact ${type} { + cc { set ret ${prefix}/bin/clang-mp-2.9 } + objc { set ret ${prefix}/bin/clang-mp-2.9 } + cxx { set ret ${prefix}/bin/clang++-mp-2.9 } + } + } + macports-clang-3.0 { + switch -exact ${type} { + cc { set ret ${prefix}/bin/clang-mp-3.0 } + objc { set ret ${prefix}/bin/clang-mp-3.0 } + cxx { set ret ${prefix}/bin/clang++-mp-3.0 } + } + } + macports-clang-3.1 { + switch -exact ${type} { + cc { set ret ${prefix}/bin/clang-mp-3.1 } + objc { set ret ${prefix}/bin/clang-mp-3.1 } + cxx { set ret ${prefix}/bin/clang++-mp-3.1 } + } + } } return $ret }