From b21a3741364ba2c7cf33db744b5a18dbd02b0b40 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 17 Dec 2020 16:02:24 +0100
Subject: [PATCH] Fix qmake build

... when no llvm-config is found.
We must only error out if the user explicitly provided a path and it
didn't work.
Amends 3e2d224722.

Change-Id: I6f81f36467571e1e05a9bab9420ee59caa9965a2
Reviewed-by: hjk <hjk@qt.io>
---
 src/shared/clang/clang_installation.pri | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
index b33e0724a26..bdfefd3616c 100644
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -14,8 +14,11 @@ isEmpty(LLVM_CONFIG) {
 
 defineReplace(llvmWarningOrError) {
     warningText = $$1
-    isEmpty(llvm_config): warning($$warningText)
-    else: error($$warningText)
+    isEmpty(LLVM_CONFIG):isEmpty(LLVM_INSTALL_DIR) {
+        warning($$warningText)
+    } else {
+        error($$warningText)
+    }
     return(false)
 }