diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-12-10 09:52:28 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-12-16 09:57:23 -0800 |
| commit | 1377c08496aef4758272524e9d587cc24d300879 (patch) | |
| tree | 419b91dd5b6a72591d8537e7f1af19e026632b32 /mesonbuild/backend/xcodebackend.py | |
| parent | 06e27d0b0e160a4e3a7265830c52662fe6b3b420 (diff) | |
| download | meson-1377c08496aef4758272524e9d587cc24d300879.tar.gz | |
review get_subdir vs get_builddir
Comparing the implementation of build_subdir with
https://github.com/mesonbuild/meson/pull/12258, both of them introduced
a similar separation between srcdir and builddir. There were some
differences in the choices of srcdir vs builddir; this commit tries to
identify which are bugs in which implementation, and get the best of
both worlds.
Diffstat (limited to 'mesonbuild/backend/xcodebackend.py')
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index b4f43f338..3da7bfe42 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1813,7 +1813,7 @@ class XCodeBackend(backends.Backend): settings_dict.add_item('GCC_SYMBOLS_PRIVATE_EXTERN', 'NO') unquoted_headers = [self.get_target_private_dir_abs(target)] if target.implicit_include_directories: - unquoted_headers.append(os.path.join(self.environment.get_build_dir(), target.get_subdir())) + unquoted_headers.append(os.path.join(self.environment.get_build_dir(), target.get_builddir())) unquoted_headers.append(os.path.join(self.environment.get_source_dir(), target.get_subdir())) unquoted_headers += headerdirs settings_dict.add_item('HEADER_SEARCH_PATHS', self.normalize_header_search_paths(unquoted_headers)) |