mirror of
https://github.com/gechandesu/v-cross-compilation-example.git
synced 2026-01-02 14:39:35 +03:00
make.vsh: fix environment setup
This commit is contained in:
3
make.vsh
3
make.vsh
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import build
|
import build
|
||||||
import crypto.sha256
|
import crypto.sha256
|
||||||
|
import maps
|
||||||
import os
|
import os
|
||||||
import term
|
import term
|
||||||
import v.vmod
|
import v.vmod
|
||||||
@@ -271,7 +272,7 @@ fn execute_command(executable string, args []string, opts CommandOptions) ! {
|
|||||||
printdbg("Run '${path}' with arguments: ${args}")
|
printdbg("Run '${path}' with arguments: ${args}")
|
||||||
mut proc := os.new_process(path)
|
mut proc := os.new_process(path)
|
||||||
proc.set_args(args)
|
proc.set_args(args)
|
||||||
proc.set_environment(opts.env)
|
proc.set_environment(maps.merge(os.environ(), opts.env))
|
||||||
proc.set_work_folder(os.getwd())
|
proc.set_work_folder(os.getwd())
|
||||||
proc.run()
|
proc.run()
|
||||||
proc.wait()
|
proc.wait()
|
||||||
|
|||||||
Reference in New Issue
Block a user