<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/341d9a0a1cc422190ca539591c5fe0efb2d212a0">https://github.com/macports/macports-base/commit/341d9a0a1cc422190ca539591c5fe0efb2d212a0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 341d9a0a1 Avoid futile find_developer_tool calls
</span>341d9a0a1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 341d9a0a1cc422190ca539591c5fe0efb2d212a0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 23 17:25:01 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Avoid futile find_developer_tool calls
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This proc tries really hard to find the given tool, which can take a
</span><span style='display:block; white-space:pre;color:#404040;'> long time, with the worst case being when it doesn't exist. So return
</span><span style='display:block; white-space:pre;color:#404040;'> from configure_get_compiler earlier for old compilers if we're on an OS
</span><span style='display:block; white-space:pre;color:#404040;'> version where we know they won't exist.
</span>---
src/port1.0/portconfigure.tcl | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a1d27c5a0..5fc086258 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1301,8 +1301,11 @@ proc portconfigure::get_mpi_wrapper {mpi compiler} {
</span> }
# utility procedure: get system compiler version by running it
proc compiler.command_line_tools_version {compiler} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.developer_dir
</span> set cc [portconfigure::configure_get_compiler cc ${compiler}]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$cc eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.developer_dir
</span> return [get_compiler_version ${cc} ${configure.developer_dir}]
}
# internal function to choose compiler fallback list based on platform
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1471,11 +1474,17 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> set clangpp [find_developer_tool clang++]
if {[file executable $clangpp]} {
return $clangpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[option os.major] <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [find_developer_tool llvm-g++-4.2]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [find_developer_tool llvm-g++-4.2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span> }
}
} elseif {[regexp {^gcc(-3\.3|-4\.[02])?$} $compiler -> suffix]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only exists in Xcode < 4.2, so 10.7 and older.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option os.major] >= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> switch $type {
cc -
objc { return [find_developer_tool "gcc${suffix}"] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1484,6 +1493,10 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> cpp { return [find_developer_tool "cpp${suffix}"] }
}
} elseif {$compiler eq "llvm-gcc-4.2"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only exists in Xcode < 5, so 10.8 and older.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option os.major] >= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> switch $type {
cc -
objc { return [find_developer_tool llvm-gcc-4.2] }
</pre><pre style='margin:0'>
</pre>