aboutsummaryrefslogtreecommitdiff
path: root/bbot/worker/worker.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-04-08 21:27:20 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-04-09 12:31:12 +0300
commit42ae325b4a8c8957acfaae65b36928163a154dbc (patch)
tree904e1b921823377ea25fa4a40b93c8ec60447cb5 /bbot/worker/worker.cxx
parent8b46db103c5495f42b37218bdb990e1e32d6a083 (diff)
Print environment setup executable target argument in worker's interactive build prompt
Diffstat (limited to 'bbot/worker/worker.cxx')
-rw-r--r--bbot/worker/worker.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 90b429e..2105939 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -267,7 +267,7 @@ run_cmd (step_id step,
dr << '\n'
<< what << '\n'
<< " current dir: " << current_directory () << '\n'
- << " environment: " << ops.environment ();
+ << " environment: " << ops.env_script () << ' ' << ops.env_target ();
if (!last_cmd.empty ())
dr << '\n'
@@ -2161,6 +2161,8 @@ startup ()
//
strings os;
+ string tg (tm.target.string ());
+
// Use the name=value notation for options to minimize the number of
// arguments passed to the environment setup executable. Note that the
// etc/environments/default-*.bat scripts can only handle the limited
@@ -2175,7 +2177,8 @@ startup ()
if (ops.tftp_host_specified ())
os.push_back ("--tftp-host=" + ops.tftp_host ());
- os.push_back (string ("--environment=") + pp.effect_string ());
+ os.push_back (string ("--env-script=") + pp.effect_string ());
+ os.push_back ("--env-target=" + tg);
// Note that we use the effective (absolute) path instead of recall since
// we may have changed the CWD.
@@ -2191,7 +2194,6 @@ startup ()
// result manifest. There is no reason to retry (most likely there is
// nobody listening on the other end anymore).
//
- string tg (tm.target.string ());
switch (run_io_exit (trace, 0, 2, 2, pp, tg, argv0.effect_string (), os))
{
case 3: