diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2019-03-12 20:35:19 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2019-03-13 16:12:34 +0000 |
| commit | 16b7afc4de02f291f7797ed21b4674431d5f55cd (patch) | |
| tree | a9c02e1ec3d3b2428a47838fa4fbdc540b95ed25 /configure.bat | |
| parent | 0f5ed788f295ccd1ecc8708ef846e957906d5b97 (diff) | |
Fix win32-clang-g++ build
Change-Id: Ide803de12736d545807a4ae650ff8f8bce5dccd8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.bat b/configure.bat index 7cadd783ea..c341f9c972 100644 --- a/configure.bat +++ b/configure.bat @@ -161,6 +161,8 @@ if "%PLATFORM%" == "" ( set PLATFORM=win32-msvc ) else if not "%clang-cl.exe%" == "" ( set PLATFORM=win32-clang-msvc + ) else if not "%clang.exe%" == "" ( + set PLATFORM=win32-clang-g++ ) else if not "%g++.exe%" == "" ( set PLATFORM=win32-g++ ) else ( @@ -172,7 +174,7 @@ if not exist "%QTSRC%\mkspecs\%PLATFORM%\qmake.conf" ( echo Host platform '%PLATFORM%' is invalid. Aborting. >&2 exit /b 1 ) -if "%PLATFORM:win32-g++=%" == "%PLATFORM%" ( +if "%PLATFORM:g++=%" == "%PLATFORM%" ( if "%MAKE%" == "" ( if not "%jom.exe%" == "" ( set MAKE=jom |