diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-08 11:22:33 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-08 13:04:11 +0100 |
| commit | 01b1d3218d70d128fe6c2f2ce3e6dce74608adaa (patch) | |
| tree | a458115610f2c73e0304a193b756e8a9b6120d3d /build_scripts | |
| parent | 65a77910f1fa065b8a113be150d2134fc2df9fe7 (diff) | |
Windows: Fix running the example tests in COIN
Move the logic expanding the Clang-related variables introduced by
c3fc507d3b2a502273bd92472e1e7aa459c2d13e to the COIN scripts since
they are needed when building the sample binding.
c3fc507d3b2a502273bd92472e1e7aa459c2d13e should then be reverted.
Task-number: PYSIDE-431
Change-Id: I1f118fdbd8989b7b9e3d24a249af81f4020c73f3
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/utils.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 0782ae036..002d6ae5b 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -691,6 +691,16 @@ def find_llvm_config(): 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("{} = {}".format(var, value)) + + # Add Clang to path for Windows for the shiboken ApiExtractor tests. # Revisit once Clang is bundled with Qt. def detect_clang(): |