From 381bee14340b6c78ee1e8c2159c357c96050558e Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 19 Sep 2016 17:25:25 +0200 Subject: [PATCH] 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 --- src/shared/clang/clang_installation.pri | 5 +++-- tests/unit/unittest/clang_dependency.pri | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index bc39b74e65a..a1a0fbb0920 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, " ") diff --git a/tests/unit/unittest/clang_dependency.pri b/tests/unit/unittest/clang_dependency.pri index 3f24a4d0239..61960c9f877 100644 --- a/tests/unit/unittest/clang_dependency.pri +++ b/tests/unit/unittest/clang_dependency.pri @@ -8,5 +8,6 @@ requires(equals(LLVM_IS_COMPILED_WITH_RTTI, "YES")) DEFINES += CLANG_UNIT_TESTS INCLUDEPATH += $$LLVM_INCLUDEPATH +win32:LIBS += -lVersion LIBS += $$LIBTOOLING_LIBS $$LIBCLANG_LIBS }