From 3b30bfa35f2c1780574261c80d2a6aafd4d2650b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 14 Nov 2018 23:57:56 +0200 Subject: [PATCH] Clang: Default to llvm-config-7 Change-Id: Id29095f378268b55430e715ec7d37f5a52159df5 Reviewed-by: Nikolai Kosjar --- qbs/modules/libclang/functions.js | 2 +- src/shared/clang/clang_installation.pri | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 594e26d69f5..d586750b21d 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -36,7 +36,7 @@ function llvmConfig(hostOS, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-6.0", "llvm-config-7.0", "llvm-config-8.0", "llvm-config-9.0" + "llvm-config", "llvm-config-7", "llvm-config-8", "llvm-config-9" ]; // Prefer llvm-config* from LLVM_INSTALL_DIR diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index afa21e23cec..02ead68bcee 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -121,15 +121,15 @@ win32: BIN_EXTENSION = .exe isEmpty(LLVM_INSTALL_DIR) { unix { - llvm_config = $$system(which llvm-config-6.0) + llvm_config = $$system(which llvm-config-7) } isEmpty(llvm_config) { llvm_config = llvm-config } } else { - exists($$LLVM_INSTALL_DIR/bin/llvm-config-6.0$$BIN_EXTENSION) { - llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-6.0) + exists($$LLVM_INSTALL_DIR/bin/llvm-config-7$$BIN_EXTENSION) { + llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-7) } else { llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config) requires(exists($$llvm_config$$BIN_EXTENSION))