diff options
| -rw-r--r-- | build_scripts/utils.py | 10 | ||||
| -rw-r--r-- | coin_build_instructions.py | 4 | ||||
| -rw-r--r-- | coin_test_instructions.py | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 767ed46af..0cf6f6676 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -667,6 +667,16 @@ def find_glob_in_path(pattern): return result +# Expand the __ARCH_ place holder in the CLANG environment variables +def expand_clang_variables(target_arch): + for var in 'LLVM_INSTALL_DIR', 'CLANG_INSTALL_DIR': + value = os.environ.get(var) + if value and '_ARCH_' in value: + value = value.replace('_ARCH_', target_arch) + os.environ[var] = value + print(f"{var} = {value}") + + # Add Clang to path for Windows for the shiboken ApiExtractor tests. # Revisit once Clang is bundled with Qt. def detect_clang(): diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 5281f278d..2ab02b973 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -38,7 +38,7 @@ ############################################################################# from build_scripts.options import has_option from build_scripts.options import option_value -from build_scripts.utils import install_pip_dependencies +from build_scripts.utils import install_pip_dependencies, expand_clang_variables from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree @@ -168,6 +168,8 @@ def call_setup(python_ver, phase): if __name__ == "__main__": # Remove some environment variables that impact cmake + arch = '32' if CI_TARGET_ARCH == 'X86' else '64' + expand_clang_variables(arch) for env_var in ['CC', 'CXX']: if os.environ.get(env_var): del os.environ[env_var] diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 6bda5b185..40f69814d 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -38,7 +38,7 @@ ############################################################################# from build_scripts.options import has_option from build_scripts.options import option_value -from build_scripts.utils import install_pip_dependencies +from build_scripts.utils import install_pip_dependencies, expand_clang_variables from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree @@ -103,6 +103,8 @@ def call_testrunner(python_ver, buildnro): def run_test_instructions(): # Remove some environment variables that impact cmake + arch = '32' if CI_TARGET_ARCH == 'X86' else '64' + expand_clang_variables(arch) for env_var in ['CC', 'CXX']: if os.environ.get(env_var): del os.environ[env_var] |