diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-11 09:35:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-11 09:35:52 +0200 |
| commit | 474af549e4fc8a662031ec87880a1ecb97da2154 (patch) | |
| tree | bf9f734631189f771ff92a1215d6bda1978d61d0 /mkspecs/features | |
| parent | 341d55b7cdf8bbb5a045ab21ac1396d1ea766344 (diff) | |
| parent | ff440191de244307c968b251faee4122267d3094 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/macdeployqt/shared/shared.h
src/qdoc/sections.cpp
Change-Id: I708a20d0061e82b99ecced7d24e7a2b8c475f706
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_find_clang.prf | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf index 169641e16..96ed76223 100644 --- a/mkspecs/features/qt_find_clang.prf +++ b/mkspecs/features/qt_find_clang.prf @@ -43,8 +43,18 @@ isEmpty(QDOC_USE_STATIC_LIBCLANG): QDOC_USE_STATIC_LIBCLANG = $$(QDOC_USE_STATIC cache(QDOC_USE_STATIC_LIBCLANG) for(_, $$list(_)) { # just a way to break easily - mingw:isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR_MINGW) - msvc:isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR_MSVC) + equals(QMAKE_HOST.os, Windows) { + # on Windows we have only two host compilers, MSVC or mingw. The former we never + # use for cross-compilation where it isn't also the target compiler. The latter + # is not detectable as this .prf file is evaluated against the target configuration + # and therefore checking for "mingw" won't work when the target compiler is clang (Android) + # or qcc (QNX). + msvc { + isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR_MSVC) + } else { + isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR_MINGW) + } + } isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR) LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR) contains(QMAKE_HOST.arch, x86_64): \ @@ -297,7 +307,7 @@ for(_, $$list(_)) { # just a way to break easily -lLLVMXRay !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--end-group CLANG_LIBS += -lz - mingw: CLANG_LIBS += -lpsapi -lshell32 -lole32 -luuid -ladvapi32 -lversion + equals(QMAKE_HOST.os, Windows): CLANG_LIBS += -lpsapi -lshell32 -lole32 -luuid -ladvapi32 -lversion else: CLANG_LIBS += -ldl equals(QMAKE_HOST.os, Darwin): CLANG_LIBS += -lcurses -lm -lxml2 } |