From ad42c88e5136d56e727b4764c5f4aaa42a4c757e Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Thu, 12 Aug 2021 03:25:56 +0100 Subject: 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. --- scripts/buildsystems/vcpkg.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') 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) -- cgit v1.2.3