diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-12-10 09:56:41 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-12-16 09:57:23 -0800 |
| commit | 06e27d0b0e160a4e3a7265830c52662fe6b3b420 (patch) | |
| tree | ad8e6c5dda6601ed01d6459e55d99bcf6092fb10 | |
| parent | da2ea717323661772430fb1fceaea280da6c487e (diff) | |
| download | meson-06e27d0b0e160a4e3a7265830c52662fe6b3b420.tar.gz | |
remove get_source_subdir
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 10 | ||||
| -rw-r--r-- | mesonbuild/build.py | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 086d19566..bf1bdbb32 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -3415,10 +3415,10 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) if pch[1] is None: # Auto generate PCH. source = self.create_msvc_pch_implementation(target, compiler.get_language(), pch[0]) - pch_header_dir = os.path.dirname(os.path.join(self.build_to_src, target.get_source_subdir(), header)) + pch_header_dir = os.path.dirname(os.path.join(self.build_to_src, target.get_subdir(), header)) commands += compiler.get_include_args(pch_header_dir, False) else: - source = os.path.join(self.build_to_src, target.get_source_subdir(), pch[1]) + source = os.path.join(self.build_to_src, target.get_subdir(), pch[1]) just_name = os.path.basename(header) (objname, pch_args) = compiler.gen_pch_args(just_name, source, dst) @@ -3459,16 +3459,16 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) compiler: Compiler = target.compilers[lang] if compiler.get_argument_syntax() == 'msvc': (commands, dep, dst, objs, src) = self.generate_msvc_pch_command(target, compiler, pch) - extradep = os.path.join(self.build_to_src, target.get_source_subdir(), pch[0]) + extradep = os.path.join(self.build_to_src, target.get_subdir(), pch[0]) elif compiler.id == 'intel': # Intel generates on target generation continue elif 'mwcc' in compiler.id: - src = os.path.join(self.build_to_src, target.get_source_subdir(), pch[0]) + src = os.path.join(self.build_to_src, target.get_subdir(), pch[0]) (commands, dep, dst, objs) = self.generate_mwcc_pch_command(target, compiler, pch[0]) extradep = None else: - src = os.path.join(self.build_to_src, target.get_source_subdir(), pch[0]) + src = os.path.join(self.build_to_src, target.get_subdir(), pch[0]) (commands, dep, dst, objs) = self.generate_gcc_pch_command(target, compiler, pch[0]) extradep = None pch_objects += objs diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 906f55289..767ceb010 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1402,9 +1402,6 @@ class BuildTarget(Target): for t in self.link_whole_targets: t.get_dependencies_recurse(result, include_internals, include_proc_macros) - def get_source_subdir(self): - return self.subdir - def get_sources(self) -> T.List[File]: return self.sources |