diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-20 09:06:16 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-20 17:07:49 +0200 |
| commit | 2f1a55c0b13ea02619f0d209a2b710fb7cbe8a1a (patch) | |
| tree | 4659347755d9b009980e3847d1cfb92f3a9bc9ab /util | |
| parent | df28355981e14c90dc0f214ceeba40be77401fb4 (diff) | |
CMake: Implement configure -linker [bfd,gold,lld]
Fixes: QTBUG-86155
Change-Id: I5ba2d3b52d9ca240b48904c492f7902a056c0292
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 86ebf4bae8..81181135ac 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -945,7 +945,6 @@ def get_feature_mapping(): "stl": None, # Do we really need to test for this in 2018?! "strip": None, "tiff": {"condition": "QT_FEATURE_imageformatplugin AND TIFF_FOUND"}, - "use_gold_linker": None, "verifyspec": None, # qmake specific... "warnings_are_errors": None, # FIXME: Do we need these? "webp": {"condition": "QT_FEATURE_imageformatplugin AND WrapWebP_FOUND"}, @@ -1007,7 +1006,8 @@ def parseFeature(ctx, feature, data, cm_fh): if isinstance(o, dict): outputType = o["type"] - if outputType in ["varAssign", "varAppend", "varRemove"]: + if outputType in ["varAssign", "varAppend", "varRemove", + "useBFDLinker", "useGoldLinker", "useLLDLinker"]: continue elif outputType == "define": publicDefine = True |