Revision: 103272 https://trac.macports.org/changeset/103272 Author: larryv@macports.org Date: 2013-02-19 12:42:35 -0800 (Tue, 19 Feb 2013) Log Message: ----------- portconfigure.tcl: Use "compiler" arg throughout configure_get_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 2013-02-19 16:02:22 UTC (rev 103271) +++ trunk/base/src/port1.0/portconfigure.tcl 2013-02-19 20:42:35 UTC (rev 103272) @@ -590,13 +590,13 @@ } } default { - if {[regexp {macports-clang-(.*)\.(.*)} ${configure.compiler} -> major minor]} { + if {[regexp {macports-clang-(.*)\.(.*)} $compiler -> major minor]} { switch -exact ${type} { cc { set ret ${prefix}/bin/clang-mp-${major}.${minor} } objc { set ret ${prefix}/bin/clang-mp-${major}.${minor} } cxx { set ret ${prefix}/bin/clang++-mp-${major}.${minor} } } - } elseif {[regexp {macports-dragonegg-(.*)\.(.*)} ${configure.compiler} -> major minor]} { + } elseif {[regexp {macports-dragonegg-(.*)\.(.*)} $compiler -> major minor]} { switch -exact ${type} { cc { set ret ${prefix}/bin/dragonegg-${major}.${minor}-gcc } objc { set ret ${prefix}/bin/dragonegg-${major}.${minor}-gcc } @@ -606,7 +606,7 @@ f77 { set ret ${prefix}/bin/dragonegg-${major}.${minor}-gfortran } f90 { set ret ${prefix}/bin/dragonegg-${major}.${minor}-gfortran } } - } elseif {[regexp {macports-gcc-(.*)\.(.*)} ${configure.compiler} -> major minor]} { + } elseif {[regexp {macports-gcc-(.*)\.(.*)} $compiler -> major minor]} { switch -exact ${type} { cc { set ret ${prefix}/bin/gcc-mp-${major}.${minor} } objc { set ret ${prefix}/bin/gcc-mp-${major}.${minor} }
participants (1)
-
larryv@macports.org