Skip to content

Commit 780ef13

Browse files
committed
Fix clang-specific cc/cxx invocations in cargo_buildscript
1 parent 02bfd31 commit 780ef13

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

prelude/rust/cargo_buildscript.bzl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ def _cargo_buildscript_impl(ctx: AnalysisContext) -> list[Provider]:
301301
)
302302
deps_link = deps_tset.project_as_args("default")
303303
sanitizer_flags = ["-fno-sanitize=all"]
304+
cc_is_clang = cxx_toolchain_info.c_compiler_info.compiler_type.startswith("clang")
305+
cxx_is_clang = cxx_toolchain_info.cxx_compiler_info.compiler_type.startswith("clang")
304306
env["LD"] = _make_cc_shim(
305307
ctx = ctx,
306308
name = "__ld_shim",
@@ -316,7 +318,7 @@ def _cargo_buildscript_impl(ctx: AnalysisContext) -> list[Provider]:
316318
name = "__cc_shim",
317319
cmd = cmd_args(
318320
cxx_toolchain_info.c_compiler_info.compiler,
319-
cmd_args(env["LD"], format = "--ld-path={}"),
321+
cmd_args(env["LD"], format = "--ld-path={}") if cc_is_clang else cmd_args(),
320322
cxx_toolchain_info.c_compiler_info.preprocessor_flags,
321323
cxx_toolchain_info.c_compiler_info.compiler_flags,
322324
deps_preprocessor_flags,
@@ -331,7 +333,7 @@ def _cargo_buildscript_impl(ctx: AnalysisContext) -> list[Provider]:
331333
name = "__cxx_shim",
332334
cmd = cmd_args(
333335
cxx_toolchain_info.cxx_compiler_info.compiler,
334-
cmd_args(env["LD"], format = "--ld-path={}"),
336+
cmd_args(env["LD"], format = "--ld-path={}") if cxx_is_clang else cmd_args(),
335337
cxx_toolchain_info.cxx_compiler_info.preprocessor_flags,
336338
cxx_toolchain_info.cxx_compiler_info.compiler_flags,
337339
deps_preprocessor_flags,

0 commit comments

Comments
 (0)