summaryrefslogtreecommitdiffstats
path: root/util/cmake/configurejson2cmake.py
diff options
context:
space:
mode:
Diffstat (limited to 'util/cmake/configurejson2cmake.py')
-rwxr-xr-xutil/cmake/configurejson2cmake.py4
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