diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-08 17:35:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-11 16:02:10 +0000 |
| commit | 5705cf87480f29e4e8f72bd47aaabb04466a7582 (patch) | |
| tree | 35cdff8f8434c7a6e67527a13c956a48785b6f94 | |
| parent | 4de06c634f451e96b47f31324e34086b0e3a0d62 (diff) | |
Revert "Replace _ARCH_ by 64/32bit in LLVM_INSTALL_DIR"
This reverts commit c3fc507d3b2a502273bd92472e1e7aa459c2d13e.
29be13664858cdb7ed7cbc02d6ad496bf57a9bbd moves this handling
to the coin scripts, where it belongs.
Some functionality was already removed by
e44e21f14d8b10b1832c5db5459bf26f287ab6e8.
Task-number: PYSIDE-431
Change-Id: I7474ea17230e484a53019eb7575d3dd9839e9263
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | build_scripts/utils.py | 3 | ||||
| -rw-r--r-- | sources/shiboken6/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sources/shiboken6/data/shiboken_helpers.cmake | 11 |
3 files changed, 0 insertions, 18 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 0cf6f6676..c2435fa17 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -687,9 +687,6 @@ def detect_clang(): clang_dir = os.environ.get(source, None) if not clang_dir: raise OSError("clang not found") - if clang_dir: - arch = '64' if sys.maxsize > 2 ** 31 - 1 else '32' - clang_dir = clang_dir.replace('_ARCH_', arch) return (clang_dir, source) diff --git a/sources/shiboken6/CMakeLists.txt b/sources/shiboken6/CMakeLists.txt index 698128a23..ac05b0267 100644 --- a/sources/shiboken6/CMakeLists.txt +++ b/sources/shiboken6/CMakeLists.txt @@ -32,10 +32,6 @@ else() shiboken_find_required_python() endif() -if (NOT PYTHON_ARCH) - get_python_arch() -endif() - setup_clang() set(SHIBOKEN_VERSION_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/shiboken_version.py") diff --git a/sources/shiboken6/data/shiboken_helpers.cmake b/sources/shiboken6/data/shiboken_helpers.cmake index 35c364f88..bb235065d 100644 --- a/sources/shiboken6/data/shiboken_helpers.cmake +++ b/sources/shiboken6/data/shiboken_helpers.cmake @@ -167,17 +167,6 @@ macro(get_python_extension_suffix) message(STATUS "PYTHON_EXTENSION_SUFFIX: " ${PYTHON_EXTENSION_SUFFIX}) endmacro() -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(STATUS "PYTHON_ARCH: " ${PYTHON_ARCH}) -endmacro() - macro(shiboken_parse_all_arguments prefix type flags options multiopts) cmake_parse_arguments(${prefix} "${flags}" "${options}" "${multiopts}" ${ARGN}) if(DEFINED ${prefix}_UNPARSED_ARGUMENTS) |