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 building thirdparty C files with tcc, when run outside vroot

Browse Source
This commit is contained in:
Delyan Angelov 2020-11-30 21:48:16 +02:00
parent 5bca6a4bfe
commit 7511d6e4e8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ fn (mut v Builder) find_win_cc() ? {
if v.pref.is_verbose { if v.pref.is_verbose {
println('msvc not found, looking for thirdparty/tcc...') println('msvc not found, looking for thirdparty/tcc...')
} }
vpath := os.dir(os.getenv('VEXE')) vpath := os.dir(pref.vexe_path())
thirdparty_tcc := os.join_path(vpath, 'thirdparty', 'tcc', 'tcc.exe') thirdparty_tcc := os.join_path(vpath, 'thirdparty', 'tcc', 'tcc.exe')
os.exec('$thirdparty_tcc -v') or { os.exec('$thirdparty_tcc -v') or {
if v.pref.is_verbose { if v.pref.is_verbose {
@ -814,12 +814,19 @@ fn (mut v Builder) build_thirdparty_obj_file(path string, moduleflags []cflag.CF
btarget := moduleflags.c_options_before_target() btarget := moduleflags.c_options_before_target()
atarget := moduleflags.c_options_after_target() atarget := moduleflags.c_options_after_target()
cppoptions := if v.pref.ccompiler.contains('++') { ' -fpermissive -w ' } else { '' } cppoptions := if v.pref.ccompiler.contains('++') { ' -fpermissive -w ' } else { '' }
//
// prepare for tcc, it needs relative paths to thirdparty/tcc to work:
current_folder := os.getwd()
os.chdir(os.dir(pref.vexe_path()))
//
cmd := '$v.pref.ccompiler $cppoptions $v.pref.third_party_option $btarget -o "$opath" -c "$cfile" $atarget' cmd := '$v.pref.ccompiler $cppoptions $v.pref.third_party_option $btarget -o "$opath" -c "$cfile" $atarget'
// eprintln('>>> cmd: $cmd')
res := os.exec(cmd) or { res := os.exec(cmd) or {
eprintln('exec failed for thirdparty object build cmd:\n$cmd') eprintln('exec failed for thirdparty object build cmd:\n$cmd')
verror(err) verror(err)
return return
} }
os.chdir(current_folder)
if res.exit_code != 0 { if res.exit_code != 0 {
eprintln('failed thirdparty object build cmd:\n$cmd') eprintln('failed thirdparty object build cmd:\n$cmd')
verror(res.output) verror(res.output)