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

cc: fix windows cross compiling for programs that use json

Browse Source
This commit is contained in:
Alexander Medvednikov 2020-06-10 17:15:24 +02:00
parent bf7f84d16f
commit 1254d7a302
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,10 @@ https://github.com/vlang/v/issues/new/choose
You can also use #help on Discord: https://discord.gg/vlang You can also use #help on Discord: https://discord.gg/vlang
') ')
const (
mingw_cc = 'x86_64-w64-mingw32-gcc'
)
fn todo() { fn todo() {
} }
@ -564,8 +568,7 @@ fn (mut c Builder) cc_windows_cross() {
println(os.user_os()) println(os.user_os())
panic('your platform is not supported yet') panic('your platform is not supported yet')
} }
mut cmd := 'x86_64-w64-mingw32-gcc' mut cmd := '$mingw_cc $optimization_options $debug_options -std=gnu11 $args -municode'
cmd += ' $optimization_options $debug_options -std=gnu11 $args -municode'
//cmd := 'clang -o $obj_name -w $include -m32 -c -target x86_64-win32 ${pref.default_module_path}/$c.out_name_c' //cmd := 'clang -o $obj_name -w $include -m32 -c -target x86_64-win32 ${pref.default_module_path}/$c.out_name_c'
if c.pref.is_verbose || c.pref.show_cc { if c.pref.is_verbose || c.pref.show_cc {
println(cmd) println(cmd)
@ -609,8 +612,17 @@ fn (c &Builder) build_thirdparty_obj_files() {
} }
} }
fn (v &Builder) build_thirdparty_obj_file(path string, moduleflags []cflag.CFlag) { fn (mut v Builder) build_thirdparty_obj_file(path string, moduleflags []cflag.CFlag) {
obj_path := os.real_path(path) obj_path := os.real_path(path)
if v.pref.os == .windows {
// Cross compiling for Windows
$if !windows {
if os.exists(obj_path) {
os.rm(obj_path)
}
v.pref.ccompiler = mingw_cc
}
}
if os.exists(obj_path) { if os.exists(obj_path) {
return return
} }