vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cc.v: build thirdparty objfiles with msvc when no cc installed

pull/3119/head
vitalyster 2019-12-16 18:56:37 +03:00 committed by Alexander Medvednikov
parent 7e0a9fb83a
commit d1714c4a2a
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vlib/compiler/cc.v
View File

@ -14,16 +14,15 @@ fn todo() {
} }
fn (v &V) no_mingw_installed() bool { fn (v &V) no_cc_installed() bool {
$if !windows { $if windows {
panic('no_mingw_installed() can only run on Windows') os.exec('$v.pref.ccompiler -v') or {
}
os.exec('gcc -v') or {
if v.pref.is_verbose { if v.pref.is_verbose {
println('mingw not found, trying to build with msvc...') println('C compiler not found, trying to build with msvc...')
} }
return true return true
} }
}
return false return false
} }
@ -72,7 +71,7 @@ fn (v mut V) cc() {
} }
} }
$if windows { $if windows {
if v.pref.ccompiler == 'msvc' || v.no_mingw_installed() { if v.pref.ccompiler == 'msvc' || v.no_cc_installed() {
v.cc_msvc() v.cc_msvc()
return return
} }
@ -487,7 +486,7 @@ fn (c &V) build_thirdparty_obj_files() {
for flag in c.get_os_cflags() { for flag in c.get_os_cflags() {
if flag.value.ends_with('.o') { if flag.value.ends_with('.o') {
rest_of_module_flags := c.get_rest_of_module_cflags( flag ) rest_of_module_flags := c.get_rest_of_module_cflags( flag )
if c.pref.ccompiler == 'msvc' { if c.pref.ccompiler == 'msvc' || c.no_cc_installed() {
build_thirdparty_obj_file_with_msvc(flag.value, rest_of_module_flags) build_thirdparty_obj_file_with_msvc(flag.value, rest_of_module_flags)
} }
else { else {