blob: 761422e07e090a56b7c501a435df350ee0c70137 [file] [log] [blame]
Andrew Geisslerac970dd2021-02-12 15:32:45 -06001From 2e9318f7a70699eed239aee6301d1d0bbd2457ee Mon Sep 17 00:00:00 2001
Andrew Geissler748a4832020-07-24 16:24:21 -05002From: Philip Balister <philip@balister.org>
3Date: Fri, 10 Jul 2020 10:14:59 -0400
4Subject: [PATCH] Do not check pointer size when cross compiling.
5
6It is reasonable to build for 32 machine on a 64 bit build machine. Prevents:
7| CMake Error at tools/FindPythonLibsNew.cmake:127 (message):
8| Python config failure: Python is 64-bit, chosen compiler is 32-bit
9
10Signed-off-by: Philip Balister <philip@balister.org>
Andrew Geisslerac970dd2021-02-12 15:32:45 -060011Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Andrew Geissler748a4832020-07-24 16:24:21 -050012---
13 tools/FindPythonLibsNew.cmake | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake
Andrew Geisslerac970dd2021-02-12 15:32:45 -060017index 3605aebc..67f4d4a0 100644
Andrew Geissler748a4832020-07-24 16:24:21 -050018--- a/tools/FindPythonLibsNew.cmake
19+++ b/tools/FindPythonLibsNew.cmake
Andrew Geisslerac970dd2021-02-12 15:32:45 -060020@@ -156,7 +156,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH)
Andrew Geissler748a4832020-07-24 16:24:21 -050021
22 # Make sure the Python has the same pointer-size as the chosen compiler
23 # Skip if CMAKE_SIZEOF_VOID_P is not defined
24-if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}"))
25+if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}"))
Andrew Geisslerac970dd2021-02-12 15:32:45 -060026 if(PythonLibsNew_FIND_REQUIRED)
27 math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8")
28 math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
Andrew Geissler748a4832020-07-24 16:24:21 -050029--
Andrew Geisslerac970dd2021-02-12 15:32:45 -0600302.17.1
Andrew Geissler748a4832020-07-24 16:24:21 -050031