Skip to content

cargo_build_script: allow files for the fake tools defaults #3822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hlopko merged 4 commits into from
Jan 29, 2026
+17 −7
Merged

cargo_build_script: allow files for the fake tools defaults #3822

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bc8029
cargo_build_script: allow files for the fake tools defaults
krasimirgg Jan 23, 2026
c92757d
configure fallbacks as optional when no cc_toolchain is present
krasimirgg Jan 26, 2026
18d36b3
sort dict
krasimirgg Jan 26, 2026
3420f39
Merge branch 'main' into cbts
krasimirgg Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions cargo/private/cargo_build_script.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,22 @@ def _cargo_build_script_impl(ctx):
env["LDFLAGS"] = " ".join(_pwd_flags(link_args))

# Defaults for cxx flags.
env["CC"] = "${{pwd}}/{}".format(ctx.executable._fallback_cc.path)
env["CXX"] = "${{pwd}}/{}".format(ctx.executable._fallback_cxx.path)
env["AR"] = "${{pwd}}/{}".format(ctx.executable._fallback_ar.path)
env["ARFLAGS"] = ""
env["CFLAGS"] = ""
env["CXXFLAGS"] = ""
fallback_tools = []
if not cc_toolchain:
fallbacks = {
"AR": "_fallback_ar",
"CC": "_fallback_cc",
"CXX": "_fallback_cxx",
}
for key, attr in fallbacks.items():
tool = getattr(ctx.executable, attr)
if not tool:
fail("cargo_build_script without a cc toolchain requires %s" % attr)
fallback_tools.append(tool)
env[key] = "${{pwd}}/{}".format(tool.path)

if cc_toolchain:
# MSVC requires INCLUDE to be set
Expand Down Expand Up @@ -516,10 +526,7 @@ def _cargo_build_script_impl(ctx):
direct = [
script,
ctx.executable._cargo_build_script_runner,
ctx.executable._fallback_cc,
ctx.executable._fallback_cxx,
ctx.executable._fallback_ar,
] + ([toolchain.target_json] if toolchain.target_json else []),
] + fallback_tools + ([toolchain.target_json] if toolchain.target_json else []),
transitive = script_data + script_tools + toolchain_tools,
)

Expand Down Expand Up @@ -744,16 +751,19 @@ cargo_build_script = rule(
"_fallback_ar": attr.label(
cfg = "exec",
executable = True,
allow_files = True,
default = Label("//cargo/private:no_ar"),
),
"_fallback_cc": attr.label(
cfg = "exec",
executable = True,
allow_files = True,
default = Label("//cargo/private:no_cc"),
),
"_fallback_cxx": attr.label(
cfg = "exec",
executable = True,
allow_files = True,
default = Label("//cargo/private:no_cxx"),
),
"_incompatible_runfiles_cargo_manifest_dir": attr.label(
Expand Down