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

cc: remove sysroot hack now that $ bug is fixed

pull/5377/head
Alexander Medvednikov 2020-06-13 22:54:20 +02:00
parent 50cd0ed785
commit 45a3d8474e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,11 +505,11 @@ fn (mut c Builder) cc_linux_cross() {
println('Cross compilation for Linux failed. Make sure you have clang installed.') println('Cross compilation for Linux failed. Make sure you have clang installed.')
} }
mut linker_args := [ linker_args := [
'-L SYSROOT/usr/lib/x86_64-linux-gnu/' '-L $sysroot/usr/lib/x86_64-linux-gnu/'
'--sysroot=SYSROOT -v -o hi -m elf_x86_64' '--sysroot=$sysroot -v -o $c.pref.out_name -m elf_x86_64'
'-dynamic-linker /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2' '-dynamic-linker /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2'
'SYSROOT/crt1.o SYSROOT/crti.o x.o' '$sysroot/crt1.o $sysroot/crti.o x.o'
//'SYSROOT/lib/x86_64-linux-gnu/libc.so.6' //'SYSROOT/lib/x86_64-linux-gnu/libc.so.6'
'-lc' '-lc'
//'-ldl' //'-ldl'
@ -518,15 +518,16 @@ fn (mut c Builder) cc_linux_cross() {
'-lssl' '-lssl'
//'-dynamic-linker /usr/lib/x86_64-linux-gnu/libcrypto.so' //'-dynamic-linker /usr/lib/x86_64-linux-gnu/libcrypto.so'
//'SYSROOT/lib/x86_64-linux-gnu/libssl.a' //'SYSROOT/lib/x86_64-linux-gnu/libssl.a'
'SYSROOT/crtn.o' '$sysroot/crtn.o'
] ]
mut s := linker_args.join(' ') linker_args_str := linker_args.join(' ')
s = s.replace('SYSROOT', sysroot) // TODO $ inter bug cmd := '$sysroot/ld.lld ' + linker_args_str
s = s.replace('-o hi', '-o ' + c.pref.out_name) //s = s.replace('SYSROOT', sysroot) // TODO $ inter bug
//s = s.replace('-o hi', '-o ' + c.pref.out_name)
if c.pref.show_cc { if c.pref.show_cc {
println('$sysroot/ld.lld ' + s) println(cmd)
} }
res := os.exec ('$sysroot/ld.lld ' + s) or { return } res := os.exec(cmd) or { return }
//println('output:') //println('output:')
//println(x.output) //println(x.output)
if res.exit_code != 0 { if res.exit_code != 0 {