mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

builder: fix bug for incorrectly detecting tcc as icc, when V was installed in a path containing icc (#17271)

Browse Source
This commit is contained in:
Riccardo
2023-02-09 23:24:03 +01:00
committed by GitHub
parent dcb9c3beb3
commit ba9a9fdc2a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/v/builder/cc.v
View File

@@ -196,12 +196,14 @@ fn (mut v Builder) setup_ccompiler_options(ccompiler string) {
} }
} }
} }
// ccompiler_file_name := os.file_name(ccompiler)
ccoptions.is_cc_tcc = ccompiler.contains('tcc') || ccoptions.guessed_compiler == 'tcc' ccoptions.is_cc_tcc = ccompiler_file_name.contains('tcc') || ccoptions.guessed_compiler == 'tcc'
ccoptions.is_cc_gcc = ccompiler.contains('gcc') || ccoptions.guessed_compiler == 'gcc' ccoptions.is_cc_gcc = ccompiler_file_name.contains('gcc') || ccoptions.guessed_compiler == 'gcc'
ccoptions.is_cc_icc = ccompiler.contains('icc') || ccoptions.guessed_compiler == 'icc' ccoptions.is_cc_icc = ccompiler_file_name.contains('icc') || ccoptions.guessed_compiler == 'icc'
ccoptions.is_cc_msvc = ccompiler.contains('msvc') || ccoptions.guessed_compiler == 'msvc' ccoptions.is_cc_msvc = ccompiler_file_name.contains('msvc')
ccoptions.is_cc_clang = ccompiler.contains('clang') || ccoptions.guessed_compiler == 'clang' || ccoptions.guessed_compiler == 'msvc'
ccoptions.is_cc_clang = ccompiler_file_name.contains('clang')
|| ccoptions.guessed_compiler == 'clang'
// For C++ we must be very tolerant // For C++ we must be very tolerant
if ccoptions.guessed_compiler.contains('++') { if ccoptions.guessed_compiler.contains('++') {
ccoptions.args << '-fpermissive' ccoptions.args << '-fpermissive'