Skip to content

Commit ed7446e

Browse files
committed
build: sync upstream prelude changes from Buck2
Signed-off-by: jl.jiang <[email protected]>
1 parent 6d942b8 commit ed7446e

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

buckal/cargo_buildscript.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def _make_rustc_shim(ctx: AnalysisContext, cwd: Artifact) -> cmd_args:
8484
sysroot_args = cmd_args()
8585

8686
shim = cmd_script(
87-
ctx = ctx,
87+
actions = ctx.actions,
8888
name = "__rustc_shim",
8989
cmd = cmd_args(toolchain_info.compiler, sysroot_args, relative_to = cwd),
9090
language = ctx.attrs._exec_os_type[OsLookup].script,

project/libipam/BUCK

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,13 @@ rust_binary(
3838
],
3939
)
4040

41-
cargo.rust_library(
41+
rust_library(
4242
name = "liblibipam",
4343
srcs = [":libipam-vendor"],
4444
crate = "libipam",
4545
crate_root = "vendor/src/lib.rs",
4646
edition = "2024",
47-
env = {
48-
"CARGO_CRATE_NAME": "libipam",
49-
"CARGO_MANIFEST_DIR": "vendor",
50-
"CARGO_PKG_AUTHORS": "rk8s-dev team",
51-
"CARGO_PKG_DESCRIPTION": "CNI Plugin IPAM",
52-
"CARGO_PKG_NAME": "libipam",
53-
"CARGO_PKG_REPOSITORY": "https://github.com/r2cn-dev/rk8s/tree/main/project/libipam",
54-
"CARGO_PKG_VERSION": "0.1.0",
55-
"CARGO_PKG_VERSION_MAJOR": "0",
56-
"CARGO_PKG_VERSION_MINOR": "1",
57-
"CARGO_PKG_VERSION_PATCH": "0",
58-
"CARGO_PKG_VERSION_PRE": "",
59-
},
47+
rustc_flags = ["@$(location :libipam-manifest[env_flags])"],
6048
visibility = ["PUBLIC"],
6149
deps = [
6250
"//third-party/rust/crates/anyhow/1.0.100:anyhow",

0 commit comments

Comments
 (0)