diff options
| author | David Chisnall <davidchisnall@users.noreply.github.com> | 2021-08-12 03:25:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 19:25:56 -0700 |
| commit | ad42c88e5136d56e727b4764c5f4aaa42a4c757e (patch) | |
| tree | fb744df102bf8b86a3bc6ea05d8b6d57aa74358e /scripts | |
| parent | 01e2abdfbf244a53feb1764700b53e5f9928f2e5 (diff) | |
| download | vcpkg-ad42c88e5136d56e727b4764c5f4aaa42a4c757e.tar.gz vcpkg-ad42c88e5136d56e727b4764c5f4aaa42a4c757e.zip | |
The FreeBSD spelling of x86-64 is amd64. (#19456)
CMAKE_HOST_SYSTEM_PROCESSOR is set to amd64 on x86-64 FreeBSD systems.
CMake's STREQUAL gives a case-sensitive comparison so this case was
missed during bootstrapping when using vcpkg as a submodule.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index e59779e4e..b38547639 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -311,7 +311,9 @@ else() cmake_policy(POP) return() endif() - elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR + CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64" OR + CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") set(Z_VCPKG_TARGET_TRIPLET_ARCH s390x) |