aboutsummaryrefslogtreecommitdiff
path: root/toolsrc
diff options
context:
space:
mode:
authorivysnow <ivy@sgri.net>2019-01-08 08:03:35 +0800
committerRobert Schumacher <roschuma@microsoft.com>2019-01-07 16:03:35 -0800
commit2d63525a154cf6aba8db2014792eec62087fe1e6 (patch)
treee833916ef1053cbf60e4835417f1b001cc7536e4 /toolsrc
parenta20ac0957a5834e6e6ee7905ec4a31c330567582 (diff)
downloadvcpkg-2d63525a154cf6aba8db2014792eec62087fe1e6.tar.gz
vcpkg-2d63525a154cf6aba8db2014792eec62087fe1e6.zip
[vcpkg] add support for FreeBSD (#4917)
* [vcpkg] add support for FreeBSD * [x64-freebsd] Remove triplet because it is not currently in the set of supported triplets
Diffstat (limited to 'toolsrc')
-rw-r--r--toolsrc/src/vcpkg/metrics.cpp2
-rw-r--r--toolsrc/src/vcpkg/tools.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp
index 2a73dba89..c34f30974 100644
--- a/toolsrc/src/vcpkg/metrics.cpp
+++ b/toolsrc/src/vcpkg/metrics.cpp
@@ -220,6 +220,8 @@ namespace vcpkg::Metrics
"OSX",
#elif defined(__linux__)
"Linux",
+#elif defined(__FreeBSD__)
+ "FreeBSD",
#elif defined(__unix__)
"Unix",
#else
diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp
index 365271872..b713b2752 100644
--- a/toolsrc/src/vcpkg/tools.cpp
+++ b/toolsrc/src/vcpkg/tools.cpp
@@ -52,11 +52,13 @@ namespace vcpkg
static constexpr StringLiteral OS_STRING = "osx";
#elif defined(__linux__)
static constexpr StringLiteral OS_STRING = "linux";
+#elif defined(__FreeBSD__)
+ static constexpr StringLiteral OS_STRING = "freebsd";
#else
return std::string("operating system is unknown");
#endif
-#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
+#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
static const std::string XML_VERSION = "2";
static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml";
static const std::regex XML_VERSION_REGEX {R"###(<tools[\s]+version="([^"]+)">)###"};