[vcpkg] Add support for muslc, static crt linkage, and forcing the system binaries for cmake and ninja

2 files changed, 13 insertions, 1 deletions

diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 3589881a7..fc7283599 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -171,8 +171,10 @@ static void inner(const VcpkgCmdArguments& args)
             default_triplet = Triplet::from_canonical_name("x64-osx");
 #elif defined(__FreeBSD__)
             default_triplet = Triplet::from_canonical_name("x64-freebsd");
-#else
+#elif defined(__GLIBC__)
             default_triplet = Triplet::from_canonical_name("x64-linux");
+#else
+            default_triplet = Triplet::from_canonical_name("x64-linux-musl");
 #endif
         }
     }
diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp
index f4ee2d653..c623d816d 100644
--- a/toolsrc/src/vcpkg/tools.cpp
+++ b/toolsrc/src/vcpkg/tools.cpp
@@ -253,6 +253,11 @@ namespace vcpkg
 
         static PathAndVersion get_path(const VcpkgPaths& paths)
         {
+            if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
+            {
+                return {"cmake", "0"};
+            }
+
             std::vector<fs::path> candidate_paths;
 #if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
             static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "cmake");
@@ -317,6 +322,11 @@ namespace vcpkg
 
         static PathAndVersion get_path(const VcpkgPaths& paths)
         {
+            if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
+            {
+                return {"ninja", "0"};
+            }
+
             static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "ninja");
 
             std::vector<fs::path> candidate_paths;