Skip to content

Commit 1beecf4

Browse files
nglevinluispadron
authored andcommitted
Cherry-pick commits fixing Bazel 9+
Starts with: 6282e27
1 parent 7bc20cc commit 1beecf4

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

apple/internal/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ bzl_library(
331331
":apple_toolchains",
332332
":cc_toolchain_info_support",
333333
":entitlements_support",
334+
":intermediates",
334335
":providers",
335336
":rule_support",
336337
"@bazel_skylib//lib:collections",

apple/internal/linking_support.bzl

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ load(
2929
"//apple/internal:entitlements_support.bzl",
3030
"entitlements_support",
3131
)
32+
load(
33+
"//apple/internal:intermediates.bzl",
34+
"intermediates",
35+
)
3236
load(
3337
"//apple/internal:multi_arch_binary_support.bzl",
3438
"subtract_linking_contexts",
@@ -282,19 +286,23 @@ def _link_multi_arch_binary(
282286
suffix = "_bin_unstripped.dwarf"
283287
else:
284288
suffix = "_bin.dwarf"
285-
dsym_binary = ctx.actions.declare_shareable_artifact(
286-
paths.join(ctx.label.package, ctx.label.name + suffix),
287-
child_config.bin_dir,
289+
dsym_binary = intermediates.file(
290+
actions = ctx.actions,
291+
target_name = ctx.label.name,
292+
output_discriminator = split_transition_key,
293+
file_name = ctx.label.name + suffix,
288294
)
289295
extensions["dsym_path"] = dsym_binary.path # dsym symbol file
290296
additional_outputs.append(dsym_binary)
291297
legacy_debug_outputs.setdefault(platform_info.target_arch, {})["dsym_binary"] = dsym_binary
292298

293299
linkmap = None
294300
if ctx.fragments.cpp.objc_generate_linkmap:
295-
linkmap = ctx.actions.declare_shareable_artifact(
296-
paths.join(ctx.label.package, ctx.label.name + ".linkmap"),
297-
child_config.bin_dir,
301+
linkmap = intermediates.file(
302+
actions = ctx.actions,
303+
target_name = ctx.label.name,
304+
output_discriminator = split_transition_key,
305+
file_name = ctx.label.name + ".linkmap",
298306
)
299307
extensions["linkmap_exec_path"] = linkmap.path # linkmap file
300308
additional_outputs.append(linkmap)

0 commit comments

Comments
 (0)