aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/script/run.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-06-16 17:08:39 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-06-18 14:18:59 +0300
commit728b075cb5e0df9c386f8377e0f6961e5ccc5143 (patch)
tree8bd60cb16a260031d46b5d79adab5821dac3dd27 /libbuild2/script/run.cxx
parent448747903956f70f85f5135a224bbbae7f7b276a (diff)
Add env script pseudo-builtin
Also disable C++ recipe tests when cross-testing.
Diffstat (limited to 'libbuild2/script/run.cxx')
-rw-r--r--libbuild2/script/run.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/libbuild2/script/run.cxx b/libbuild2/script/run.cxx
index 46c061c..b90ba48 100644
--- a/libbuild2/script/run.cxx
+++ b/libbuild2/script/run.cxx
@@ -1619,16 +1619,19 @@ namespace build2
? process::path_search (args[0])
: process_path ());
- // Note: the builtin-escaping character '^' is not printed.
+ // Note that CWD and builtin-escaping character '^' are not printed.
//
+ process_env pe (resolve ? pp : c.program, c.variables);
+
if (verb >= 2)
- print_process (args);
+ print_process (pe, args);
process pr (
- resolve ? pp : c.program,
+ *pe.path,
args.data (),
{ifd.get (), -1}, process::pipe (ofd), {-1, efd.get ()},
- env.work_dir.path->string ().c_str ());
+ env.work_dir.path->string ().c_str (),
+ pe.vars);
ifd.reset ();
ofd.out.reset ();