<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/adb89e7e14d1ba6ac330077392eaef94e38f76cf">https://github.com/macports/macports-base/commit/adb89e7e14d1ba6ac330077392eaef94e38f76cf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit adb89e7e14d1ba6ac330077392eaef94e38f76cf
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 27 17:23:05 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Pick system compiler correctly for non-macosx
</span>---
src/port1.0/portconfigure.tcl | 41 +++++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 18 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 fedf9adc3..60e221a1f 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;'>@@ -1272,26 +1272,31 @@ proc portconfigure::get_compiler_fallback {} {
</span> return $default_compilers
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for platforms without Xcode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$xcodeversion eq "none" || $xcodeversion eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set available_apple_compilers [portconfigure::get_apple_compilers_os_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set available_apple_compilers [portconfigure::get_apple_compilers_xcode_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set system_compilers [list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach c ${available_apple_compilers} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set vmin [portconfigure::get_min_command_line $c]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$vmin ne "none"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$c eq "apple-gcc-4.2"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # provided by a port, should be the latest version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend system_compilers $c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [compiler.command_line_tools_version $c]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${vmin} $v] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend system_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option os.subplatform] eq "macosx"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for macOS without Xcode (i.e. CLTs only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$xcodeversion eq "none" || $xcodeversion eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set available_apple_compilers [portconfigure::get_apple_compilers_os_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set available_apple_compilers [portconfigure::get_apple_compilers_xcode_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set system_compilers [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach c ${available_apple_compilers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vmin [portconfigure::get_min_command_line $c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$vmin ne "none"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$c eq "apple-gcc-4.2"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # provided by a port, should be the latest version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend system_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [compiler.command_line_tools_version $c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${vmin} $v] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend system_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # not macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set system_compilers [list cc]
</span> }
set clang_compilers [list]
set vmin [portconfigure::get_min_clang]
</pre><pre style='margin:0'>
</pre>