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: small cleanup, use .dump_c_options in Builder.cc_linux_cross/0 too

Browse Source
This commit is contained in:
Delyan Angelov 2021-01-29 18:30:40 +02:00
parent 4d180171ba
commit 2326a3a1e1
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,6 @@ const (
mingw_cc = 'x86_64-w64-mingw32-gcc' mingw_cc = 'x86_64-w64-mingw32-gcc'
) )
fn todo() {
}
fn (mut v Builder) find_win_cc() ? { fn (mut v Builder) find_win_cc() ? {
$if !windows { $if !windows {
return none return none
@ -629,7 +626,6 @@ fn (mut v Builder) cc() {
} }
} }
// //
todo()
os.chdir(vdir) os.chdir(vdir)
cmd := '$ccompiler @$response_file' cmd := '$ccompiler @$response_file'
tried_compilation_commands << cmd tried_compilation_commands << cmd
@ -783,6 +779,7 @@ fn (mut b Builder) cc_linux_cross() {
cc_args << '-o "$obj_file"' cc_args << '-o "$obj_file"'
cc_args << '-c "$b.out_name_c"' cc_args << '-c "$b.out_name_c"'
cc_args << libs cc_args << libs
b.dump_c_options(cc_args)
cc_cmd := 'cc ' + cc_args.join(' ') cc_cmd := 'cc ' + cc_args.join(' ')
if b.pref.show_cc { if b.pref.show_cc {
println(cc_cmd) println(cc_cmd)
@ -801,6 +798,7 @@ fn (mut b Builder) cc_linux_cross() {
'-lc', '-lcrypto', '-lssl', '-lpthread', '$sysroot/crtn.o'] '-lc', '-lcrypto', '-lssl', '-lpthread', '$sysroot/crtn.o']
linker_args << cflags.c_options_only_object_files() linker_args << cflags.c_options_only_object_files()
// -ldl // -ldl
b.dump_c_options(linker_args)
linker_cmd := '$sysroot/ld.lld ' + linker_args.join(' ') linker_cmd := '$sysroot/ld.lld ' + linker_args.join(' ')
// s = s.replace('SYSROOT', sysroot) // TODO $ inter bug // s = s.replace('SYSROOT', sysroot) // TODO $ inter bug
// s = s.replace('-o hi', '-o ' + c.pref.out_name) // s = s.replace('-o hi', '-o ' + c.pref.out_name)