diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2016-12-30 13:45:30 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2017-01-10 10:06:23 +0000 |
| commit | 03a59d1bb80d61902417f835629054086a13cff8 (patch) | |
| tree | 024b30fc0bde7d0b59287221c7130b95166061bf /configure.json | |
| parent | a35a01aaa2aa4d3ba8d3c619ec2d18fcc4a6ad2f (diff) | |
Add support for building for INTEGRITY using GHS toolchain
Initial support for INTEGRITY to build QtBase
Change-Id: I18f36b4dea9107f01e1c281e4b62880590c777a1
Reviewed-by: Tuukka Turunen <tuukka.turunen@theqtcompany.com>
Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 51eab72df2..70b406b6a7 100644 --- a/configure.json +++ b/configure.json @@ -481,7 +481,7 @@ }, "use_gold_linker": { "label": "Using gold linker", - "condition": "!config.msvc && tests.use_gold_linker", + "condition": "!config.msvc && !config.integrity && tests.use_gold_linker", "output": [ "privateConfig", "useGoldLinker" ] }, "architecture": { |