Skip to content

Commit b026b25

Browse files
nglevinluispadron
authored andcommitted
Fix generation of dSYM bundles in a multi-architecture build to have the ".dSYM" suffix, which Crosstool logic requires.
Cherry-pick: 5b07139
1 parent 9a9b037 commit b026b25

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

apple/internal/linking_support.bzl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,19 +272,21 @@ def _link_multi_arch_binary(
272272
else:
273273
dsym_bundle_name = bundle_name
274274

275+
full_dsym_bundle_name = "{dsym_bundle_name}.dSYM".format(
276+
dsym_bundle_name = dsym_bundle_name,
277+
)
278+
275279
if multi_arch_build:
276280
dsym_output = intermediates.directory(
277281
actions = ctx.actions,
278282
target_name = bundle_name,
279283
output_discriminator = cc_toolchain.target_gnu_system_name,
280-
dir_name = dsym_bundle_name,
284+
dir_name = full_dsym_bundle_name,
281285
)
282286
else:
283287
# Avoiding "intermediates" as this will be the only dSYM in a single arch build.
284288
dsym_output = ctx.actions.declare_directory(
285-
"{dsym_bundle_name}.dSYM".format(
286-
dsym_bundle_name = dsym_bundle_name,
287-
),
289+
full_dsym_bundle_name,
288290
)
289291
elif dsym_variants != "flat":
290292
fail("""

0 commit comments

Comments
 (0)