Xcode: fix custom targets that produce objs and libs.

1 files changed, 1 insertions, 23 deletions

diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index aa89932..e8a7d4b 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2109,7 +2109,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
                 args = [x.replace('@DEPFILE@', depfile) for x in base_args]
             args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)
                     for x in args]
-            args = self.replace_outputs(args, self.get_target_private_dir(target), outfilelist)
+            args =  self.replace_outputs(args, self.get_target_private_dir(target), outfilelist)
             # We have consumed output files, so drop them from the list of remaining outputs.
             if len(generator.outputs) > 1:
                 outfilelist = outfilelist[len(generator.outputs):]
@@ -2314,28 +2314,6 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
         return (rel_obj, rel_src)
 
     @lru_cache(maxsize=None)
-    def get_normpath_target(self, source) -> str:
-        return os.path.normpath(source)
-
-    def get_custom_target_dir_include_args(self, target, compiler):
-        custom_target_include_dirs = []
-        for i in target.get_generated_sources():
-            # Generator output goes into the target private dir which is
-            # already in the include paths list. Only custom targets have their
-            # own target build dir.
-            if not isinstance(i, (build.CustomTarget, build.CustomTargetIndex)):
-                continue
-            idir = self.get_normpath_target(self.get_target_dir(i))
-            if not idir:
-                idir = '.'
-            if idir not in custom_target_include_dirs:
-                custom_target_include_dirs.append(idir)
-        incs = []
-        for i in custom_target_include_dirs:
-            incs += compiler.get_include_args(i, False)
-        return incs
-
-    @lru_cache(maxsize=None)
     def generate_inc_dir(self, compiler, d, basedir, is_system):
         # Avoid superfluous '/.' at the end of paths when d is '.'
         if d not in ('', '.'):