From 2f1a55c0b13ea02619f0d209a2b710fb7cbe8a1a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 20 Aug 2020 09:06:16 +0200 Subject: CMake: Implement configure -linker [bfd,gold,lld] Fixes: QTBUG-86155 Change-Id: I5ba2d3b52d9ca240b48904c492f7902a056c0292 Reviewed-by: Alexandru Croitor --- util/cmake/configurejson2cmake.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/cmake/configurejson2cmake.py') 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 -- cgit v1.2.3