diff options
author | Martin Storsjö <martin@martin.st> | 2019-04-25 12:13:13 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2019-04-25 09:29:23 +0000 |
commit | 65a33d73ea6e95de997503e4796d7c9ba685438a (patch) | |
tree | d9a1ebf4bbb9ab8e69841049f932aee74e3495e8 /mkspecs | |
parent | fc2e9ac7e060bf693f6c4df17e419539f0547878 (diff) | |
download | qtbase-65a33d73ea6e95de997503e4796d7c9ba685438a.tar.gz |
qmake: Always split QMAKE_DEFAULT_LIBDIRS using ; with clang on windows
When building in a unix style build system (i.e. msys), QMAKE_DIRLIST_SEP
is a colon, not a semicolon. Thus, always split the incoming string
(after the fixup regex) using semicolons on windows.
This matches the code for gcc, further up, which does:
equals(QMAKE_HOST.os, Windows): \
paths = $$split(line, ;)
else: \
paths = $$split(line, $$QMAKE_DIRLIST_SEP)
Change-Id: I6a0175f9d14ae9ca188553483b7868f0549c784a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/toolchain.prf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index 9c3a64aa8b..03612e5689 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -267,9 +267,13 @@ isEmpty($${target_prefix}.INCDIRS) { for (line, output) { contains(line, "^libraries: .*") { line ~= s,^libraries: ,, - # clang (7.x) on Windows uses the wrong path list separator ... - equals(QMAKE_HOST.os, Windows): line ~= s,:(?![/\\\\]),;, - paths = $$split(line, $$QMAKE_DIRLIST_SEP) + equals(QMAKE_HOST.os, Windows) { + # clang (7.x) on Windows uses the wrong path list separator ... + line ~= s,:(?![/\\\\]),;, + paths = $$split(line, ;) + } else { + paths = $$split(line, $$QMAKE_DIRLIST_SEP) + } for (path, paths): \ QMAKE_DEFAULT_LIBDIRS += $$clean_path($$replace(path, ^=, $$[SYSROOT])) } |