Revert "Make 'default_library' per-subproject builtin option"revsp

This reverts commit 3ba0073df6014d4b594df052f8e1fa75ce17b20e.

1 files changed, 2 insertions, 13 deletions

diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index cfa457436..dff5ecc36 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -180,10 +180,9 @@ def list_targets(builddata: build.Build, installdata, backend: backends.Backend)
     return tlist
 
 def list_buildoptions_from_source(intr: IntrospectionInterpreter) -> T.List[T.Dict[str, T.Union[str, bool, int, T.List[str]]]]:
-    subprojects = [i['name'] for i in intr.project_data['subprojects']]
-    return list_buildoptions(intr.coredata, subprojects)
+    return list_buildoptions(intr.coredata)
 
-def list_buildoptions(coredata: cdata.CoreData, subprojects: T.Optional[T.List[str]] = None) -> T.List[T.Dict[str, T.Union[str, bool, int, T.List[str]]]]:
+def list_buildoptions(coredata: cdata.CoreData) -> T.List[T.Dict[str, T.Union[str, bool, int, T.List[str]]]]:
     optlist = []  # type: T.List[T.Dict[str, T.Union[str, bool, int, T.List[str]]]]
 
     dir_option_names = ['bindir',
@@ -207,16 +206,6 @@ def list_buildoptions(coredata: cdata.CoreData, subprojects: T.Optional[T.List[s
     test_options = {k: o for k, o in coredata.builtins.items() if k in test_option_names}
     core_options = {k: o for k, o in coredata.builtins.items() if k in core_option_names}
 
-    if subprojects:
-        # Add per subproject built-in options
-        sub_core_options = {}
-        for sub in subprojects:
-            for k, o in core_options.items():
-                if o.yielding:
-                    continue
-                sub_core_options[sub + ':' + k] = o
-        core_options.update(sub_core_options)
-
     def add_keys(options: T.Dict[str, cdata.UserOption], section: str, machine: str = 'any') -> None:
         for key in sorted(options.keys()):
             opt = options[key]