<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6a881b681e6c82a3fb02730405144d62b186f23f">https://github.com/macports/macports-ports/commit/6a881b681e6c82a3fb02730405144d62b186f23f</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 6a881b681e6 Compilers: Add clang-12 to known list, limited to Darwin18+
</span>6a881b681e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6a881b681e6c82a3fb02730405144d62b186f23f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Jun 3 21:15:05 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> Compilers: Add clang-12 to known list, limited to Darwin18+
</span>---
_resources/port1.0/compilers/clang_compilers.tcl | 5 ++++-
_resources/port1.0/group/clang_dependency-1.0.tcl | 2 +-
_resources/port1.0/group/compilers-1.0.tcl | 11 +++++++----
3 files changed, 12 insertions(+), 6 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 42144f5b32e..ef68bd88990 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;'>@@ -32,7 +32,10 @@ if { ${os.arch} ne "arm" && ${os.major} >= 9 && ${os.major} < 20 } {
</span> macports-clang-5.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Add 10 and 11 as defaults *after* 9.0 - 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Add 10+ as defaults *after* 9.0 - 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 18} {
</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> if { ${os.major} >= 10} {
lappend compilers macports-clang-11
if { ${os.arch} ne "arm" } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/clang_dependency-1.0.tcl b/_resources/port1.0/group/clang_dependency-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d5843604f72..67e11896d8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/clang_dependency-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/clang_dependency-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,4 +11,4 @@ proc clang_dependency.extra_versions {versions} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-clang_dependency.extra_versions {devel 11 10 9.0 8.0 7.0 6.0 5.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+clang_dependency.extra_versions {devel 12 11 10 9.0 8.0 7.0 6.0 5.0}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a0e5a0fa0cb..2c40fc5360b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,9 +159,7 @@ foreach ver ${gcc_versions} {
</span>
# build database of clang compiler attributes
# Should match those in compilers/clang_compilers.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.arch} eq "arm" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clang_versions {11 devel}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.arch} ne "arm" } {
</span> set clang_versions {}
if {${os.major} < 16} {
if {${os.major} < 9} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,9 +177,14 @@ if { ${os.arch} eq "arm" } {
</span> if { ${os.major} < 20 } {
lappend clang_versions 8.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend clang_versions 9.0 10 11 devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_versions 9.0 10
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+lappend clang_versions 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 18 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_versions 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lappend clang_versions devel
</span> ui_debug "Clang versions for Darwin ${os.major} ${os.arch} - ${clang_versions}"
foreach ver ${clang_versions} {
# Remove dot from version if present
</pre><pre style='margin:0'>
</pre>