aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorYang Shen <aplshenyang@gmail.com>2019-02-01 04:06:58 +0800
committerRobert Schumacher <roschuma@microsoft.com>2019-01-31 12:06:58 -0800
commit92bd67970d33ecdc1767c1dd042d73b7d1d998b0 (patch)
tree89ef93283712fb32b11b7a2dc6a6978ef7d1615d /toolsrc/src
parent36cb7592b18d261f87ef366f9271ca45eadffb88 (diff)
downloadvcpkg-92bd67970d33ecdc1767c1dd042d73b7d1d998b0.tar.gz
vcpkg-92bd67970d33ecdc1767c1dd042d73b7d1d998b0.zip
Adding #elif macros for ARM and ARM64 (#5232)
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg/base/system.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp
index 8aa1db53c..b25412f7a 100644
--- a/toolsrc/src/vcpkg/base/system.cpp
+++ b/toolsrc/src/vcpkg/base/system.cpp
@@ -74,6 +74,10 @@ namespace vcpkg::System
return CPUArchitecture::X64;
#elif defined(__x86__) || defined(_M_X86)
return CPUArchitecture::X86;
+#elif defined(__arm__) || defined(_M_ARM)
+ return CPUArchitecture::ARM;
+#elif defined(__aarch64__) || defined(_M_ARM64)
+ return CPUArchitecture::ARM64;
#else
#error "Unknown host architecture"
#endif