diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-06-16 11:48:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-06-16 11:48:08 +0200 |
| commit | 905f5d4e1b5784001138f2acbbad0ed9c49aa714 (patch) | |
| tree | cd0d03ed5a5293f359db970006d34bcd484b3296 /coin | |
| parent | e3c03fd3c5d6a20748a260b9952c84aadbf03be5 (diff) | |
| parent | 8ec23e44a2b85a83f3b17ee05191d47006c83727 (diff) | |
| download | qt-creator-905f5d4e1b5784001138f2acbbad0ed9c49aa714.tar.gz | |
Merge remote-tracking branch 'origin/4.15'
Conflicts:
coin/instructions/common_environment.yaml
Change-Id: I2084c24f7e052b9647b30f810207b3c8beecce3c
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/common_environment.yaml | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 535d69634b..99c85e2d4a 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -14,23 +14,9 @@ instructions: - type: EnvironmentVariable variableName: LLVM_BASE_URL variableValue: http://master.qt.io/development_releases/prebuilt/libclang/libclang-release_120-based - - - type: Group - enable_if: - condition: property - property: target.compiler - in_values: [MSVC2019] - instructions: - - type: EnvironmentVariable - variableName: MAKEFLAGS - variableValue: "" - type: EnvironmentVariable - variableName: LLVM_INSTALL_DIR - variableValue: "{{.Env.LLVM_DYNAMIC_LIBS_100}}" - enable_if: - condition: property - property: target.arch - equals_value: X86 + variableName: MACOSX_DEPLOYMENT_TARGET + variableValue: 10.14 - type: PrependToEnvironmentVariable variableName: PATH |