From 728b075cb5e0df9c386f8377e0f6961e5ccc5143 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 16 Jun 2020 17:08:39 +0300
Subject: Add env script pseudo-builtin

Also disable C++ recipe tests when cross-testing.
---
 libbuild2/script/run.cxx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'libbuild2/script/run.cxx')

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 ();
-- 
cgit v1.1