Skip to content

Commit d0dbbcb

Browse files
committed
clang compilers: allow clang-16 again on macOS15+
1 parent 59bca6e commit d0dbbcb

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

_resources/port1.0/compilers/clang_compilers.tcl

+13-11
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,21 @@ if {${os.major} >= 11 || ${os.platform} ne "darwin"} {
2929
lappend compilers macports-clang-17
3030
}
3131

32-
# exclude clang-16 and older on macOS15+
33-
if { ( ${os.major} <= 23 && ${os.major} >= 10 ) || ${os.platform} ne "darwin"} {
32+
if { ${os.major} >= 10 || ${os.platform} ne "darwin"} {
3433
# On Darwin10 only use selection here if c++20+ required
3534
if { ${os.platform} ne "darwin" || ${os.major} >= 11 || ${compiler.cxx_standard} >= 2020 } {
36-
lappend compilers macports-clang-16 \
37-
macports-clang-15 \
38-
macports-clang-14
39-
if {${os.major} < 23 || ${os.platform} ne "darwin"} {
40-
# https://trac.macports.org/ticket/68257
41-
# Versions of clang older than clang-14 probably have build issues on
42-
# macOS14+. Until resolved do not append to fallback list.
43-
# Unlikely they will ever really be needed here though.
44-
lappend compilers macports-clang-13 macports-clang-12
35+
# These are allowed still on macOS15+
36+
lappend compilers macports-clang-16
37+
if { ${os.major} < 24 || ${os.platform} ne "darwin"} {
38+
# Still have some issues on macOS15+ so disallow as 'official' fallbacks
39+
lappend compilers macports-clang-15 macports-clang-14
40+
if {${os.major} < 23 || ${os.platform} ne "darwin"} {
41+
# https://trac.macports.org/ticket/68257
42+
# Versions of clang older than clang-14 probably have build issues on
43+
# macOS14+. Until resolved do not append to fallback list.
44+
# Unlikely they will ever really be needed here though.
45+
lappend compilers macports-clang-13 macports-clang-12
46+
}
4547
}
4648
}
4749
}

_resources/port1.0/group/compilers-1.0.tcl

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ if { ${os.major} >= 9 || ${os.platform} ne "darwin" } {
193193
if { ${os.major} <= 23 || ${os.platform} ne "darwin"} {
194194
lappend clang_versions 11
195195
if { ${os.major} >= 11 || ${os.platform} ne "darwin"} {
196-
lappend clang_versions 12 13 14 15 16
196+
lappend clang_versions 12 13 14 15
197197
}
198198
}
199199
if { ${os.major} >= 11 || ${os.platform} ne "darwin"} {
200-
lappend clang_versions 17 18 19
200+
lappend clang_versions 16 17 18 19
201201
}
202202
if { ${os.major} >= 14 } {
203203
lappend clang_versions devel

0 commit comments

Comments
 (0)