summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-12-10 13:18:09 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2018-12-12 09:50:08 +0000
commitdbe2b941313b8dcd24d3ceec3860ae9ff0da58a1 (patch)
treee361d5de47cb214d5edf0d8eb62cbc6b1b162e4c
parentbb35a2d244accde7908ddaaa17571b971eb564f0 (diff)
downloadqttools-dbe2b941313b8dcd24d3ceec3860ae9ff0da58a1.tar.gz
Minor clean up in llvm detection
When calling llvm-config to determine the installation prefix, ignore output on stderr (possibly from the shell), to avoid confusing output when llvm-config is not even installed or in the PATH. Change-Id: I9534ffe90c20040972f3b5390f58936ac4839670 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--mkspecs/features/qt_find_clang.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf
index d7cc4edff..5f9775126 100644
--- a/mkspecs/features/qt_find_clang.prf
+++ b/mkspecs/features/qt_find_clang.prf
@@ -57,7 +57,7 @@ for(_, $$list(_)) { # just a way to break easily
}
isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR)
# Assume libclang is installed on the target system
- isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$system("llvm-config --prefix")
+ isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$system("llvm-config --prefix 2>$$QMAKE_SYSTEM_NULL_DEVICE")
LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR)
contains(QMAKE_HOST.arch, x86_64): \