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

gen.golang: dont push run_args in run_file assignent

Browse Source
This commit is contained in:
Joe Conigliaro
2022-06-29 18:54:26 +10:00
parent eec60a3018
commit 51649b924b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,15 +83,12 @@ fn (mut b Builder) run_compiled_executable_and_exit() {
exit(0) exit(0)
} }
compiled_file := os.real_path(b.pref.out_name) compiled_file := os.real_path(b.pref.out_name)
mut run_args := []string{cap: b.pref.run_args.len + 1}
run_file := if b.pref.backend.is_js() { run_file := if b.pref.backend.is_js() {
run_args << compiled_file
node_basename := $if windows { 'node.exe' } $else { 'node' } node_basename := $if windows { 'node.exe' } $else { 'node' }
os.find_abs_path_of_executable(node_basename) or { os.find_abs_path_of_executable(node_basename) or {
panic('Could not find `$node_basename` in system path. Do you have Node.js installed?') panic('Could not find `$node_basename` in system path. Do you have Node.js installed?')
} }
} else if b.pref.backend == .golang { } else if b.pref.backend == .golang {
run_args << ['run', compiled_file]
go_basename := $if windows { 'go.exe' } $else { 'go' } go_basename := $if windows { 'go.exe' } $else { 'go' }
os.find_abs_path_of_executable(go_basename) or { os.find_abs_path_of_executable(go_basename) or {
panic('Could not find `$go_basename` in system path. Do you have Node.js installed?') panic('Could not find `$go_basename` in system path. Do you have Node.js installed?')
@@ -99,6 +96,12 @@ fn (mut b Builder) run_compiled_executable_and_exit() {
} else { } else {
compiled_file compiled_file
} }
mut run_args := []string{cap: b.pref.run_args.len + 1}
if b.pref.backend.is_js() {
run_args << compiled_file
} else if b.pref.backend == .golang {
run_args << ['run', compiled_file]
}
run_args << b.pref.run_args run_args << b.pref.run_args
mut run_process := os.new_process(run_file) mut run_process := os.new_process(run_file)
run_process.set_args(run_args) run_process.set_args(run_args)