diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-05 15:22:04 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-09-05 15:30:53 +0000 |
| commit | 1856a0989a9be541ec71fb3fc9648321f4cf3844 (patch) | |
| tree | 0c63b26a05cd3b785b23ee2ff0a79f2ccbc1df97 | |
| parent | 3a51a17d72f49647449eab949ae30d7c09ced3ef (diff) | |
Fix order of includePaths and systemIncludePaths
Was like this since introduction. Does not use -isystem for
systemIncludePaths because not all assemblers support that (for example
nasm, which the original patch intended to introduce support for).
Change-Id: I12623c760d529336df41883f02ffef74d67dbc3f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index 573b9c5ab..3f5309985 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -677,10 +677,10 @@ function prepareAssembler(project, product, inputs, outputs, input, output) { ModUtils.moduleProperties(input, 'flags', tag)); var allIncludePaths = []; - if (systemIncludePaths) - allIncludePaths = allIncludePaths.uniqueConcat(systemIncludePaths); if (includePaths) allIncludePaths = allIncludePaths.uniqueConcat(includePaths); + if (systemIncludePaths) + allIncludePaths = allIncludePaths.uniqueConcat(systemIncludePaths); args = args.concat(allIncludePaths.map(function(path) { return '-I' + path })); args.push("-o", output.filePath); |