aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-04-23 19:10:54 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-04-23 23:03:26 +0300
commit22d0e6dd550472caf396b906ec0ae37c01899ad7 (patch)
tree9f4fd435af028749b53b6c65d594c6af3cc0b9e1
parent0785ec3317ad8ce36e7cbecaabb57938f86c2abd (diff)
downloadmeson-22d0e6dd550472caf396b906ec0ae37c01899ad7.zip
meson-22d0e6dd550472caf396b906ec0ae37c01899ad7.tar.gz
meson-22d0e6dd550472caf396b906ec0ae37c01899ad7.tar.bz2
Xcode: even more command line argument expansion.
-rw-r--r--mesonbuild/backend/xcodebackend.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index f731282..b0fab16 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -1165,7 +1165,12 @@ class XCodeBackend(backends.Backend):
base_args = generator.get_arglist(infilename)
for o_base in genlist.get_outputs_for(i):
o = os.path.join(self.get_target_private_dir(t), o_base)
- args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', o).replace('@BUILD_DIR@', self.get_target_private_dir(t)) for x in base_args]
+ args = []
+ for arg in base_args:
+ arg = arg.replace("@INPUT@", infilename)
+ arg = arg.replace('@OUTPUT@', o).replace('@BUILD_DIR@', self.get_target_private_dir(t))
+ arg = arg.replace("@CURRENT_SOURCE_DIR@", os.path.join(self.build_to_src, t.subdir))
+ args.append(arg)
args = self.replace_outputs(args, self.get_target_private_dir(t), outfilelist)
args = self.replace_extra_args(args, genlist)
if generator.capture: