interpreter: add static_lib objects to shared_lib in build_both

This makes more sense if we can re-use the object files anyway. It might
make sense eventually to just convert this to create the shared_lib by
`link_whole` with the `static_lib` in the case of reusable files. THis
might also fix the xcode problem

Author: dcbaker

mesonbuild/interpreter/interpreter.py

@@ -3054,16 +3054,16 @@ def build_both_libraries(self, node, args, kwargs):
             reuse_object_files = static_lib.pic
 
         if reuse_object_files:
-            # Replace sources with objects from the shared library to avoid
-            # building them twice. We post-process the static library instead of
+            # Replace sources with objects from the static library to avoid
+            # building them twice. We post-process the shared library instead of
             # removing sources from args because sources could also come from
             # any InternalDependency, see BuildTarget.add_deps().
-            static_lib.objects.append(build.ExtractedObjects(shared_lib, shared_lib.sources, shared_lib.generated, []))
-            static_lib.sources = []
-            static_lib.generated = []
+            shared_lib.objects.append(build.ExtractedObjects(static_lib, static_lib.sources, static_lib.generated, []))
+            shared_lib.sources = []
+            shared_lib.generated = []
             # Compilers with no corresponding sources confuses the backend.
             # Keep only compilers used for linking
-            static_lib.compilers = {k: v for k, v in static_lib.compilers.items() if k in compilers.clink_langs}
+            shared_lib.compilers = {k: v for k, v in shared_lib.compilers.items() if k in compilers.clink_langs}
 
         return build.BothLibraries(shared_lib, static_lib)