summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2017-09-27 00:24:31 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-09-29 03:19:57 +0000
commit06cb408979831250298c4492ea8133e362c1bcc7 (patch)
tree77183882e78a9b0346e1e597a906842d0a040e49
parent8ea5c401094b78c40c21811c9514462797218ae2 (diff)
Add support for ICC in toolchain.prf
Task-number: QTBUG-62531 Change-Id: Ie15a349c830258058d48c9da18b52b343bdb943a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--mkspecs/features/toolchain.prf4
1 files 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/ .*//