diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-17 18:57:36 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-18 19:19:29 +0300 |
| commit | 126db6de129cf04b64b7b9a1f4486f7171d26ad0 (patch) | |
| tree | 20190f70e6b086f0d9427f99bb6a6c515072a6f0 | |
| parent | 09d89dfaebb6bda63eff748148be09b6ae2c9d30 (diff) | |
| download | meson-126db6de129cf04b64b7b9a1f4486f7171d26ad0.zip meson-126db6de129cf04b64b7b9a1f4486f7171d26ad0.tar.gz meson-126db6de129cf04b64b7b9a1f4486f7171d26ad0.tar.bz2 | |
Xcode: fix running commands that lie in the build root dir.
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 81f1b70..90d7b79 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -1200,7 +1200,7 @@ class Backend: 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: + if target.absolute_paths or absolute_outputs: i = os.path.join(self.environment.get_build_dir(), i) # FIXME: str types are blindly added ignoring 'target.absolute_paths' # because we can't know if they refer to a file or just a string diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index bcb17b1..606469a 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1002,9 +1002,9 @@ class XCodeBackend(backends.Backend): for tname, t in self.custom_targets.items(): if not isinstance(t, build.CustomTarget): continue - (srcs, ofilenames, cmd) = self.eval_custom_target_command(t) + (srcs, ofilenames, cmd) = self.eval_custom_target_command(t, absolute_outputs=True) fixed_cmd, _ = self.as_meson_exe_cmdline(t.name, - t.command[0], + cmd[0], cmd[1:], #workdir=None, env=t.env) |