diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-30 09:36:26 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-05-01 06:34:05 +0000 |
| commit | 41369b628203a0400a5e81184b2aa38e44ab5350 (patch) | |
| tree | 7e9e1cd3c2c08ef4714c50b3ae0f0fb8d4f10294 /coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 | |
| parent | d14d8f0cac68018a17ec4177d31dbc4dd0ea55a9 (diff) | |
Install the MinGW build of libclang
This restores the MinGW installation of libclang on Windows 7 and
installs the MSVC and MinGW builds in parallel on Windows 10. For
compatibility reasons the MSVC installation is done last, to ensure that
the older LLVM_INSTALL_DIR variable points to the MSVC installation. In
addition though we now get LLVM_INSTALL_DIR_MINGW and
LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the
future.
Task-number: QTBUG-66015
Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/08-libclang.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 index 8da8cc5a..4d56d612 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 @@ -1 +1,3 @@ +# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015 |