From c3fc507d3b2a502273bd92472e1e7aa459c2d13e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 20 Sep 2017 12:57:25 +0200
Subject: Replace _ARCH_ by 64/32bit in LLVM_INSTALL_DIR

Task-number: PYSIDE-431
Change-Id: I6d4ea037ab0c524f305ed72f95745deb410b8971
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/shiboken2/CMakeLists.txt | 17 +++++++++++++++++
 utils.py                         |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
index bd715bb9c..06b951767 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
@@ -27,14 +27,31 @@ else()
     find_package(PythonLibs 2.6)
 endif()
 
+macro(get_python_arch)
+  execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -c "if True:
+       import sys
+       print('64' if sys.maxsize > 2**31-1 else '32')
+       "
+    OUTPUT_VARIABLE PYTHON_ARCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message("PYTHON_ARCH:             " ${PYTHON_ARCH})
+endmacro()
+
+if (NOT PYTHON_ARCH)
+    get_python_arch()
+endif()
+
 set(CLANG_DIR "")
 set(CLANG_DIR_SOURCE "")
 
 if (DEFINED ENV{LLVM_INSTALL_DIR})
     set(CLANG_DIR $ENV{LLVM_INSTALL_DIR})
+    string(REPLACE "_ARCH_" "${PYTHON_ARCH}" CLANG_DIR "${CLANG_DIR}")
     set(CLANG_DIR_SOURCE "LLVM_INSTALL_DIR")
 elseif (DEFINED ENV{CLANG_INSTALL_DIR})
     set(CLANG_DIR $ENV{CLANG_INSTALL_DIR})
+    string(REPLACE "_ARCH_" "${PYTHON_ARCH}" CLANG_DIR "${CLANG_DIR}")
     set(CLANG_DIR_SOURCE "CLANG_INSTALL_DIR")
 else ()
     EXEC_PROGRAM("llvm-config" ARGS "--prefix" OUTPUT_VARIABLE CLANG_DIR)
diff --git a/utils.py b/utils.py
index 088d66667..cbd19c207 100644
--- a/utils.py
+++ b/utils.py
@@ -676,4 +676,7 @@ def detectClang():
                     clangDir = output[0]
             except OSError:
                 pass
+    if clangDir:
+        arch = '64' if sys.maxsize > 2**31-1 else '32'
+        clangDir = clangDir.replace('_ARCH_', arch)
     return (clangDir, source)
-- 
cgit v1.2.3