From 2ad6aa134d9e8e755c8c738d0b51d72b0851c212 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 24 Jun 2019 11:25:05 +0200
Subject: Constrain access to options to build system driver main() only

---
 build2/context.cxx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'build2/context.cxx')

diff --git a/build2/context.cxx b/build2/context.cxx
index a4ff001..e71201d 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -494,12 +494,11 @@ namespace build2
     {
       // Did the user ask us to use config.guess?
       //
-      string orig (
-        ops.config_guess_specified ()
-        ? run<string> (3,
-                       ops.config_guess (),
-                       [](string& l, bool) {return move (l);})
-        : BUILD2_HOST_TRIPLET);
+      string orig (config_guess
+                   ? run<string> (3,
+                                  *config_guess,
+                                  [](string& l, bool) {return move (l);})
+                   : BUILD2_HOST_TRIPLET);
 
       l5 ([&]{trace << "original host: '" << orig << "'";});
 
-- 
cgit v1.1