summaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorCepsylon <cepsylon@gmail.com>2024-06-27 20:47:25 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2024-07-10 21:40:05 +0300
commit0fade02fe26d89d54cccc711b4d8a29143ebea8a (patch)
treea8ca49ae1d0b2c41cd4d69e2e2f8dc61421220d9 /mesonbuild
parent2ad1113b7ebf09c08ae6df89e1e8d8bf1960a24a (diff)
downloadmeson-0fade02fe26d89d54cccc711b4d8a29143ebea8a.tar.gz
backend: xcode fix map access in generate_pbx_sources_build_phase for CustomTargetIndex
Fix incorrect map access to custom_target_output_buildfile in CustomTargetIndex case. Map keys are file names with the path appended, but the used keys were just the file name. This led to crashes.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/xcodebackend.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index 69a544b24..344ac1f82 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -1454,7 +1454,9 @@ class XCodeBackend(backends.Backend):
file_arr.add_item(self.custom_target_output_buildfile[o],
os.path.join(self.environment.get_build_dir(), o))
elif isinstance(gt, build.CustomTargetIndex):
+ output_dir = self.get_custom_target_output_dir(gt)
for o in gt.get_outputs():
+ o = os.path.join(output_dir, o)
file_arr.add_item(self.custom_target_output_buildfile[o],
os.path.join(self.environment.get_build_dir(), o))
elif isinstance(gt, build.GeneratedList):