@@ -28,10 +28,10 @@ index 3f8617428b..72ca4b6225 100644
2828 name = "toolchain_data",
2929 srcs = glob([
3030diff --git a/third_party/rocm_device_libs/build_defs.bzl b/third_party/rocm_device_libs/build_defs.bzl
31- index 845618bd9c..f84e69462c 100644
31+ index 845618bd9c..2a66d91425 100644
3232--- a/third_party/rocm_device_libs/build_defs.bzl
3333+++ b/third_party/rocm_device_libs/build_defs.bzl
34- @@ -2,110 +2,148 @@
34+ @@ -2,110 +2,145 @@
3535
3636 load("@bazel_skylib//lib:paths.bzl", "paths")
3737
@@ -227,6 +227,7 @@ index 845618bd9c..f84e69462c 100644
227227+ inputs = [strip_out],
228228+ outputs = [final_bc],
229229+ arguments = [strip_out.path, "-o", final_bc.path],
230+ + use_default_shell_env = True,
230231+ progress_message = "Preparing final bitcode for {}".format(ctx.label.name),
231232 )
232233+
@@ -244,25 +245,21 @@ index 845618bd9c..f84e69462c 100644
244245+ "_clang": attr.label(
245246+ default = Label("@local_config_rocm//rocm:hipcc"),
246247+ executable = True,
247- + use_default_shell_env = True,
248248+ cfg = "exec",
249249+ ),
250250+ "_llvm_link": attr.label(
251251+ default = Label("@local_config_rocm//rocm:llvm-link"),
252252+ executable = True,
253- + use_default_shell_env = True,
254253+ cfg = "exec",
255254+ ),
256255+ "_opt": attr.label(
257256+ default = Label("@local_config_rocm//rocm:opt"),
258257+ executable = True,
259- + use_default_shell_env = True,
260258+ cfg = "exec",
261259+ ),
262260+ "_prepare_builtins": attr.label(
263261+ default = Label(":prepare_builtins"),
264262+ executable = True,
265- + use_default_shell_env = True,
266263+ cfg = "exec",
267264+ ),
268265+ "_clang_includes": attr.label(
0 commit comments