aboutsummaryrefslogtreecommitdiff
path: root/bbot/worker.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'bbot/worker.cxx')
-rw-r--r--bbot/worker.cxx23
1 files changed, 21 insertions, 2 deletions
diff --git a/bbot/worker.cxx b/bbot/worker.cxx
index 0212d26..a2e53b2 100644
--- a/bbot/worker.cxx
+++ b/bbot/worker.cxx
@@ -182,7 +182,9 @@ build (size_t argc, const char* argv[])
for (const variable& v: tm.config)
cfg.push_back (v.unquoted ());
- dir_path dir ("build");
+ // Use target (if present) or machine as configuration directory name.
+ //
+ dir_path dir (tm.target ? tm.target->string () : tm.machine);
r.status |= run_bpkg (trace, r.log,
"create",
@@ -380,10 +382,27 @@ startup ()
// Run it.
//
+ strings os;
+
+ if (ops.systemd_daemon ())
+ os.push_back ("--systemd-daemon");
+
+ if (ops.verbose_specified ())
+ {
+ os.push_back ("--verbose");
+ os.push_back (to_string (ops.verbose ()));
+ }
+
+ if (ops.tftp_host_specified ())
+ {
+ os.push_back ("--tftp-host");
+ os.push_back (ops.tftp_host ());
+ }
+
// Note that we use the effective (absolute) path instead of recall since
// we may have changed the CWD.
//
- run (trace, pp, tg, argv0.effect_string ());
+ run (trace, pp, tg, argv0.effect_string (), os);
}
catch (const failed&)
{