diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:15:57 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:15:57 +0300 |
| commit | 8d8e799cb7ab0bebe8f6dd4172848159eb3c8087 (patch) | |
| tree | 143f0ade6f75a55fcf6824e2b5a5b8a3e48ba1fa /coin/instructions/common_environment.yaml | |
| parent | 2342e61cb53824e2dcd6324e3d108500d61ffee2 (diff) | |
| parent | 927c0d3e625455a8e5fedef3ed6662c8acba1858 (diff) | |
Merge tag 'v5.15.9-lts' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Qt For Python Release 5.15.9
Change-Id: I6a2717036c50f27aa0eeea6cfcfbc2970c0bd04a
Diffstat (limited to 'coin/instructions/common_environment.yaml')
| -rw-r--r-- | coin/instructions/common_environment.yaml | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 41ab0059c..cf391324e 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -119,6 +119,32 @@ instructions: variableName: LLVM_INSTALL_DIR variableValue: "{{.Env.LLVM_DYNAMIC_LIBS_100}}" disable_if: + condition: and + conditions: + - condition: property + property: target.arch + equals_value: X86_64-ARM64 # When target arch is universal binary, we can use the default libclang + - condition: property + property: host.os + equals_value: MacOS + - type: EnvironmentVariable + variableName: LLVM_INSTALL_DIR + variableValue: "/Users/qt/libclang-dynlibs-10.0-universal/libclang-dynlibs-10.0" + enable_if: + condition: and + conditions: + - condition: property + property: target.arch + equals_value: X86_64-ARM64 # When target arch is universal binary, we can use the default libclang + - condition: property + property: host.os + equals_value: MacOS + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "/Library/Frameworks/Python.framework/Versions/3.9/bin:" + enable_if: condition: property - property: host.osVersion - equals_value: openSUSE_15_1 + property: host.os + equals_value: MacOS + + |