<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cc87e6d82b6c3fc6ae3e40f121204cedbcdefb88">https://github.com/macports/macports-ports/commit/cc87e6d82b6c3fc6ae3e40f121204cedbcdefb88</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 cc87e6d82b6 Update clang compiler selection order
</span>cc87e6d82b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cc87e6d82b6c3fc6ae3e40f121204cedbcdefb88
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jan 7 22:39:20 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> Update clang compiler selection order
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move clang 12, 11 and 10 to the front of the list on supported OS
</span><span style='display:block; white-space:pre;color:#404040;'> versions. Simplify logic.
</span>---
_resources/port1.0/compilers/clang_compilers.tcl | 45 +++++++++++-------------
1 file changed, 20 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/compilers/clang_compilers.tcl b/_resources/port1.0/compilers/clang_compilers.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a340b6bfc0b..e4f2aec80ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/compilers/clang_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/compilers/clang_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,46 +10,41 @@
</span> # Clang 11 and newer only on Apple Silicon
# Clang 9.0 and newer only on 11+ (Darwin 20)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-global os.major os.arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global os.major
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if { $${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: evaluate compatibility of clang-{10,11} as defaults instead of 9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #lappend compilers macports-clang-11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.arch} ne "arm" && ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: evaluate compatibility of clang-{10,11} as defaults instead of 9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #lappend compilers macports-clang-10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-clang-9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-clang-8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option build_arch] ne "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-10 macports-clang-9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.arch} ne "arm" && ${os.major} >= 9 && ${os.major} < 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 9 && ${os.major} < 20} {
</span> lappend compilers macports-clang-7.0 \
macports-clang-6.0 \
macports-clang-5.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Add 10+ as defaults *after* 9.0 - 5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-clang-13 macports-clang-12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-clang-11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.arch} ne "arm" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-clang-10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 13 is still pretty new, so add *after* 12 - 5.0 but before versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that should only be used for bootstrapping. Will only be used if the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# versions listed earlier don't meet the requirements.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-13
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 16 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 16} {
</span> # The Sierra SDK requires a toolchain that supports class properties
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 9 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 9} {
</span> lappend compilers macports-clang-3.7
}
lappend compilers macports-clang-3.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 9 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 9} {
</span> lappend compilers macports-clang-3.3
}
}
</pre><pre style='margin:0'>
</pre>