diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-11-14 23:57:56 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-11-15 09:54:07 +0000 |
| commit | 3b30bfa35f2c1780574261c80d2a6aafd4d2650b (patch) | |
| tree | 4b25ca3739ab5afaeac7bdee5e5fde443cf08a5f | |
| parent | e38c8724e468d283778ed538c3ecbb12607a05ed (diff) | |
| download | qt-creator-3b30bfa35f2c1780574261c80d2a6aafd4d2650b.tar.gz | |
Clang: Default to llvm-config-7
Change-Id: Id29095f378268b55430e715ec7d37f5a52159df5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | qbs/modules/libclang/functions.js | 2 | ||||
| -rw-r--r-- | 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 594e26d69f..d586750b21 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 afa21e23ce..02ead68bce 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)) |