aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-08-29 10:12:53 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2017-08-30 08:50:48 +0000
commita91bf40e89f6cd3915bca5229efe707d96241a0b (patch)
tree40c2bd6660dedcecbf434fd4001e6563203102ed /share
parentd88440717fd1cc06c22784c7d63acfbd1949056d (diff)
Fix handling of gcc's -isystem option
Even though it works to append the filepath directly to the option, the man page and common sense suggest to use separate arguments. Change-Id: I04312df1bf2f955630b0f105a347e0e9187153c7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/gcc.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 873aea531..d003d8d89 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -747,9 +747,7 @@ function compilerFlags(project, product, input, output, explicitlyDependsOn) {
allSystemIncludePaths = allSystemIncludePaths.uniqueConcat(systemIncludePaths);
if (distributionIncludePaths)
allSystemIncludePaths = allSystemIncludePaths.uniqueConcat(distributionIncludePaths);
- args = args.concat(allSystemIncludePaths.map(function(path) {
- return input.cpp.systemIncludeFlag + path;
- }));
+ allSystemIncludePaths.forEach(function(v) { args.push(input.cpp.systemIncludeFlag, v); });
var minimumWindowsVersion = input.cpp.minimumWindowsVersion;
if (minimumWindowsVersion && product.qbs.targetOS.contains("windows")) {