aboutsummaryrefslogtreecommitdiff
path: root/build2/utility.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-06-24 11:25:05 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-06-24 11:25:05 +0200
commit2ad6aa134d9e8e755c8c738d0b51d72b0851c212 (patch)
tree9d914797975e61350d41c9fdb71ee008b2aacdfc /build2/utility.cxx
parent85399cf60764b0fe54d44d4a5bacb54feae8dd62 (diff)
Constrain access to options to build system driver main() only
Diffstat (limited to 'build2/utility.cxx')
-rw-r--r--build2/utility.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/build2/utility.cxx b/build2/utility.cxx
index 91aecdf..9448c03 100644
--- a/build2/utility.cxx
+++ b/build2/utility.cxx
@@ -69,13 +69,16 @@ namespace build2
//
// <build2/utility.hxx>
//
-
- options ops;
process_path argv0;
- bool stderr_term;
const standard_version build_version (BUILD2_VERSION_STR);
+ bool dry_run_option;
+ optional<bool> mtime_check_option;
+
+ optional<path> config_sub;
+ optional<path> config_guess;
+
void
check_build_version (const standard_version_constraint& c, const location& l)
{
@@ -483,23 +486,20 @@ namespace build2
}
void
- init (const char* a0, uint16_t v)
+ init (const char* a0,
+ bool kg, bool dr, optional<bool> mc,
+ optional<path> cs, optional<path> cg)
{
// Build system driver process path.
//
argv0 = process::path_search (a0, true);
- // Diagnostics verbosity.
- //
- verb = v;
+ keep_going = kg;
+ dry_run_option = dr;
+ mtime_check_option = mc;
- // Initialize time conversion data that is used by localtime_r().
- //
-#ifndef _WIN32
- tzset ();
-#else
- _tzset ();
-#endif
+ config_sub = move (cs);
+ config_guess = move (cg);
// Figure out work and home directories.
//