Skip to content

Commit 884614c

Browse files
davidbenCQ bot account: commit-bot@chromium.org
authored and
CQ bot account: [email protected]
committed
Use CMAKE_SIZEOF_VOID_P instead of CMAKE_CL_64
CMake's documentation says this is preferred. https://cmake.org/cmake/help/latest/variable/CMAKE_CL_64.html Reportedly, it also works better with MINGW, though we do not currently support MINGW with the CMake build. See https://boringssl-review.googlesource.com/c/boringssl/+/41704/ Change-Id: Ie5794306beeeff816b34ee98c7a0f8e0d4f99ec8 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/41724 Reviewed-by: Adam Langley <[email protected]> Commit-Queue: David Benjamin <[email protected]>
1 parent cd8f3d3 commit 884614c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
471471
set(ARCH "x86_64")
472472
elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
473473
# cmake reports AMD64 on Windows, but we might be building for 32-bit.
474-
if(CMAKE_CL_64)
474+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
475475
set(ARCH "x86_64")
476476
else()
477477
set(ARCH "x86")

util/generate_build_files.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ def __init__(self):
489489
set(ARCH "x86_64")
490490
elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
491491
# cmake reports AMD64 on Windows, but we might be building for 32-bit.
492-
if(CMAKE_CL_64)
492+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
493493
set(ARCH "x86_64")
494494
else()
495495
set(ARCH "x86")

0 commit comments

Comments
 (0)