Skip to content

Commit c112b75

Browse files
committed
fix: refactor compiler settings for CI detection
1 parent 904c7aa commit c112b75

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

tools/options/meson.build

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,30 @@ if get_option('run_in_ci')
3535

3636
endif
3737

38+
clang_20_compiler = ['clang', ['>=20', '<21']]
39+
gcc_14_compiler = ['gcc', ['>=14', '<15']]
40+
3841
ci_config = {
3942
'cross_android': {
40-
'compilers': [['clang', ['>=20', '<21']]],
43+
'compilers': [clang_20_compiler],
4144
},
4245
'cross_3ds': {
43-
'compilers': [['clang', ['>=20', '<21']]],
46+
'compilers': [clang_20_compiler],
4447
},
4548
'cross_switch': {
46-
'compilers': [['clang', ['>=20', '<21']]],
49+
'compilers': [clang_20_compiler],
4750
},
4851
'cross_emscripten': {
49-
'compilers': [['clang', ['>=20', '<21']]],
52+
'compilers': [clang_20_compiler],
5053
},
5154
'windows': {
52-
'compilers': [['clang', ['>=20', '<21']]],
55+
'compilers': [clang_20_compiler],
5356
},
5457
'linux': {
55-
'compilers': [['clang', ['>=20', '<21']]],
58+
'compilers': [clang_20_compiler, gcc_14_compiler],
5659
},
5760
'darwin': {
58-
'compilers': [['clang', ['>=20', '<21']]],
61+
'compilers': [clang_20_compiler],
5962
},
6063
}
6164

0 commit comments

Comments
 (0)