[vcpkg] Improve default triplets for non-windows

3 files changed, 12 insertions, 5 deletions

diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h
index 6ef840fb3..6294853af 100644
--- a/toolsrc/include/vcpkg/base/strings.h
+++ b/toolsrc/include/vcpkg/base/strings.h
@@ -46,7 +46,7 @@ namespace vcpkg::Strings
 
     bool case_insensitive_ascii_equals(const CStringView left, const CStringView right);
 
-    std::string ascii_to_lowercase(const std::string& input);
+    std::string ascii_to_lowercase(std::string input);
 
     bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern);
 
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index d9b915367..a65045aa8 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -157,7 +157,15 @@ static void inner(const VcpkgCmdArguments& args)
         }
         else
         {
+#if defined(_WIN32)
             default_triplet = Triplet::X86_WINDOWS;
+#elif defined(__APPLE__)
+            default_triplet = Triplet::from_canonical_name("x64-osx");
+#elif defined(__FreeBSD__)
+            default_triplet = Triplet::from_canonical_name("x64-freebsd");
+#else
+            default_triplet = Triplet::from_canonical_name("x64-linux");
+#endif
         }
     }
 
diff --git a/toolsrc/src/vcpkg/base/strings.cpp b/toolsrc/src/vcpkg/base/strings.cpp
index d912734e3..a08512c9f 100644
--- a/toolsrc/src/vcpkg/base/strings.cpp
+++ b/toolsrc/src/vcpkg/base/strings.cpp
@@ -108,11 +108,10 @@ namespace vcpkg::Strings
 #endif
     }
 
-    std::string ascii_to_lowercase(const std::string& input)
+    std::string ascii_to_lowercase(std::string s)
     {
-        std::string output(input);
-        std::transform(output.begin(), output.end(), output.begin(), &details::tolower_char);
-        return output;
+        std::transform(s.begin(), s.end(), s.begin(), &details::tolower_char);
+        return s;
     }
 
     bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern)