diff options
author | Arrigo Zanette <zanettea@gmail.com> | 2018-01-08 02:55:52 -0800 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-08 14:00:17 +0000 |
commit | b08481ec22ffb42f6ce36ccdee57c60724c44bf4 (patch) | |
tree | fe85249df3cd48f94a43e630f354e50e91bf270c /share | |
parent | 3bde712fa2c1f926720e85d20ae7fd5f9f378fef (diff) |
GCC: Reorder prefixHeaders and precompiled headers
Prefix headers should follow precompiled headers on the gcc command
line. Testcase added.
Change-Id: I3dfba8cae9c894932acce5c0a67f16d7d072c94b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/modules/cpp/gcc.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index f638d3cb3..be0829322 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -702,12 +702,6 @@ function compilerFlags(project, product, input, output, explicitlyDependsOn) { args.push('-fvisibility=default') } - var prefixHeaders = input.cpp.prefixHeaders; - for (i in prefixHeaders) { - args.push('-include'); - args.push(prefixHeaders[i]); - } - if (compilerInfo.language) // Only push language arguments if we have to. Array.prototype.push.apply(args, compilerInfo.language); @@ -728,6 +722,12 @@ function compilerFlags(project, product, input, output, explicitlyDependsOn) { args.push('-include', pchFilePath); } + var prefixHeaders = input.cpp.prefixHeaders; + for (i in prefixHeaders) { + args.push('-include'); + args.push(prefixHeaders[i]); + } + var positionIndependentCode = input.cpp.positionIndependentCode; if (positionIndependentCode && !product.qbs.toolchain.contains("mingw")) args.push('-fPIC'); |