diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2016-09-19 17:25:25 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2016-09-19 15:27:25 +0000 |
| commit | 381bee14340b6c78ee1e8c2159c357c96050558e (patch) | |
| tree | 8a7a0c512312d6618e05878100eaf52a698005fc /src/shared | |
| parent | 47c01daeb27436e90121b7438c1b28e09fc2ebbc (diff) | |
Clang: fix llvm lib linking on windows
If we use paths with spaces we cannot split them anymore so we have to
handle unix and windows differently.
Change-Id: Ibfc8c51cfe2ecd68e913ad84e0e1269eb7eeda02
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index bc39b74e65..a1a0fbb092 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -73,11 +73,12 @@ win32: BIN_EXTENSION = .exe llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config) requires(exists($$llvm_config$$BIN_EXTENSION)) #message("llvm-config found, querying it for paths and version") -LLVM_LIBDIR = $$system($$llvm_config --libdir, lines) +LLVM_LIBDIR = $$quote($$system($$llvm_config --libdir, lines)) LLVM_INCLUDEPATH = $$system($$llvm_config --includedir, lines) output = $$system($$llvm_config --version, lines) LLVM_VERSION = $$extractVersion($$output) -LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libs, lines) +unix:LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libs, lines) +win32:LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libnames, lines) LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --system-libs, lines) LLVM_STATIC_LIBS = $$split(LLVM_STATIC_LIBS_STRING, " ") |