aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--toolsrc/include/vcpkg.h4
-rw-r--r--toolsrc/src/vcpkg.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/toolsrc/include/vcpkg.h b/toolsrc/include/vcpkg.h
index 832fb1920..2fc993616 100644
--- a/toolsrc/include/vcpkg.h
+++ b/toolsrc/include/vcpkg.h
@@ -7,19 +7,17 @@
namespace vcpkg
{
- extern bool g_do_dry_run;
-
StatusParagraphs database_load_check(const vcpkg_paths& paths);
void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs& status_db);
void deinstall_package(const vcpkg_paths& paths, const package_spec& spec, StatusParagraphs& status_db);
expected<SourceParagraph> try_load_port(const fs::path& control_path);
+
inline expected<SourceParagraph> try_load_port(const vcpkg_paths& paths, const std::string& name)
{
return try_load_port(paths.ports / name);
}
expected<BinaryParagraph> try_load_cached_package(const vcpkg_paths& paths, const package_spec& spec);
-
} // namespace vcpkg
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index c198365e1..6c34497b2 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -17,8 +17,6 @@
using namespace vcpkg;
-bool vcpkg::g_do_dry_run = false;
-
static StatusParagraphs load_current_database(const fs::path& vcpkg_dir_status_file, const fs::path& vcpkg_dir_status_file_old)
{
if (!fs::exists(vcpkg_dir_status_file))