From 06cb408979831250298c4492ea8133e362c1bcc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Wed, 27 Sep 2017 00:24:31 +0300
Subject: [PATCH] Add support for ICC in toolchain.prf

Task-number: QTBUG-62531
Change-Id: Ie15a349c830258058d48c9da18b52b343bdb943a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 mkspecs/features/toolchain.prf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 35175f1744..7b6f48de72 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -120,7 +120,7 @@ isEmpty($${target_prefix}.INCDIRS) {
                 }
             }
         }
-        !darwin:clang {
+        if(!darwin:clang)|intel_icc {
             # Clang on a non-Apple system (that is, a system without ld64 -- say, with GNU ld
             # or gold under Linux) will not print any library search path. Need to use another
             # invocation with different options (which in turn doesn't print include search
@@ -205,7 +205,7 @@ isEmpty($${target_prefix}.COMPILER_MACROS) {
         vars = $$qtVariablesFromGCC($$QMAKE_CXX)
     }
     for (v, vars) {
-        isEmpty(v)|contains(v, $${LITERAL_HASH}.*): next()
+        contains(v, $${LITERAL_HASH}.*)|contains(v, " *"): next()
         # Set both <varname> for the outer scope ...
         eval($$v)
         v ~= s/ .*//