From 7192d3affa4b1d8f88e3e730eb561612c24f7d78 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Mon, 15 Jun 2020 14:34:26 -0700
Subject: [vcpkg] Delete g_binary_caching global that should be passed as a
 parameter. (#11958)

---
 toolsrc/include/vcpkg/build.h             | 1 +
 toolsrc/include/vcpkg/globalstate.h       | 2 --
 toolsrc/include/vcpkg/vcpkgcmdarguments.h | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index 560e856b9..864317fb9 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -34,6 +34,7 @@ namespace vcpkg::Build
         void perform_and_exit_ex(const FullPackageSpec& full_spec,
                                  const SourceControlFileLocation& scfl,
                                  const PortFileProvider::PathsPortFileProvider& provider,
+                                 const bool binary_caching_enabled,
                                  IBinaryProvider& binaryprovider,
                                  const VcpkgPaths& paths);
 
diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h
index 263b5f80c..35ca71dbb 100644
--- a/toolsrc/include/vcpkg/globalstate.h
+++ b/toolsrc/include/vcpkg/globalstate.h
@@ -13,8 +13,6 @@ namespace vcpkg
         static Util::LockGuarded<Chrono::ElapsedTimer> timer;
         static Util::LockGuarded<std::string> g_surveydate;
 
-        static std::atomic<bool> g_binary_caching;
-
         static std::atomic<int> g_init_console_cp;
         static std::atomic<int> g_init_console_output_cp;
         static std::atomic<bool> g_init_console_initialized;
diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
index 4856f6db1..e4ed0471b 100644
--- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h
+++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
@@ -130,6 +130,7 @@ namespace vcpkg
         // feature flags
         Optional<bool> feature_packages = nullopt;
         Optional<bool> binary_caching = nullopt;
+        bool binary_caching_enabled() const { return binary_caching.value_or(false); }
 
         std::string command;
         std::vector<std::string> command_arguments;
-- 
cgit v1.2.3