diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-17 18:29:24 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-18 19:19:29 +0300 |
| commit | 09d89dfaebb6bda63eff748148be09b6ae2c9d30 (patch) | |
| tree | 3d90a9466c2c0423283c5884a69ca2772d7ddaae | |
| parent | fa947e6d7597ef507967f8095e961b84762fae8b (diff) | |
| download | meson-09d89dfaebb6bda63eff748148be09b6ae2c9d30.zip meson-09d89dfaebb6bda63eff748148be09b6ae2c9d30.tar.gz meson-09d89dfaebb6bda63eff748148be09b6ae2c9d30.tar.bz2 | |
Xcode: fix custom target chaining.
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 | ||||
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index ea5f30d..81f1b70 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -1111,7 +1111,7 @@ class Backend: elif isinstance(i, build.BuildTarget): fname = [self.get_target_filename(i)] elif isinstance(i, (build.CustomTarget, build.CustomTargetIndex)): - fname = [os.path.join(self.get_target_dir(i), p) for p in i.get_outputs()] + fname = [os.path.join(self.get_custom_target_output_dir(i), p) for p in i.get_outputs()] elif isinstance(i, build.GeneratedList): fname = [os.path.join(self.get_target_private_dir(target), p) for p in i.get_outputs()] elif isinstance(i, build.ExtractedObjects): @@ -1197,7 +1197,7 @@ class Backend: # GIR scanner will attempt to execute this binary but # it assumes that it is in path, so always give it a full path. tmp = i.get_outputs()[0] - i = os.path.join(self.get_target_dir(i), tmp) + i = os.path.join(self.get_custom_target_output_dir(i), tmp) elif isinstance(i, mesonlib.File): i = i.rel_to_builddir(self.build_to_src) if target.absolute_paths: diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index bd24bc1..bcb17b1 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -211,7 +211,7 @@ class XCodeBackend(backends.Backend): return str(uuid.uuid4()).upper().replace('-', '')[:24] def get_target_dir(self, target): - dirname = os.path.join(self.environment.coredata.get_option(OptionKey('buildtype')), target.get_subdir()) + dirname = os.path.join(target.get_subdir(), self.environment.coredata.get_option(OptionKey('buildtype'))) os.makedirs(os.path.join(self.environment.get_build_dir(), dirname), exist_ok=True) return dirname |