Merge pull request #3577 from noverby/wip/rib/java-codegen

Include target build directory while compiling Java, for generated code dependencies (Polished)

1 files changed, 5 insertions, 1 deletions

diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index c508cec..c7e194e 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1029,9 +1029,13 @@ int dummy;
         args += self.build.get_project_args(compiler, target.subproject)
         args += target.get_java_args()
         args += compiler.get_output_args(self.get_target_private_dir(target))
+        curdir = target.get_subdir()
+        sourcepath = os.path.join(self.build_to_src, curdir) + os.pathsep
+        sourcepath += os.path.normpath(curdir) + os.pathsep
         for i in target.include_dirs:
             for idir in i.get_incdirs():
-                args += ['-sourcepath', os.path.join(self.build_to_src, i.curdir, idir)]
+                sourcepath += os.path.join(self.build_to_src, i.curdir, idir) + os.pathsep
+        args += ['-sourcepath', sourcepath]
         rel_src = src.rel_to_builddir(self.build_to_src)
         plain_class_path = src.fname[:-4] + 'class'
         rel_obj = os.path.join(self.get_target_private_dir(target), plain_class_path)