Skip to content

Commit ddcf7a5

Browse files
BennoLossinjannau
authored andcommitted
rust: add pin-init as a dependency to bindings and uapi
This allows `bindings` and `uapi` to implement `Zeroable` and use other items from pin-init. Co-developed-by: Miguel Ojeda <ojeda@kernel.org> Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Link: https://rust-for-linux.zulipchat.com/#narrow/channel/291565-Help/topic/Zeroable.20trait.20for.20C.20structs/near/510264158 Signed-off-by: Benno Lossin <lossin@kernel.org>
1 parent 43758cb commit ddcf7a5

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

rust/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,17 +517,19 @@ $(obj)/ffi.o: private skip_gendwarfksyms = 1
517517
$(obj)/ffi.o: $(src)/ffi.rs $(obj)/compiler_builtins.o FORCE
518518
+$(call if_changed_rule,rustc_library)
519519

520-
$(obj)/bindings.o: private rustc_target_flags = --extern ffi
520+
$(obj)/bindings.o: private rustc_target_flags = --extern ffi --extern pin_init
521521
$(obj)/bindings.o: $(src)/bindings/lib.rs \
522522
$(obj)/ffi.o \
523+
$(obj)/pin_init.o \
523524
$(obj)/bindings/bindings_generated.rs \
524525
$(obj)/bindings/bindings_helpers_generated.rs FORCE
525526
+$(call if_changed_rule,rustc_library)
526527

527-
$(obj)/uapi.o: private rustc_target_flags = --extern ffi
528+
$(obj)/uapi.o: private rustc_target_flags = --extern ffi --extern pin_init
528529
$(obj)/uapi.o: private skip_gendwarfksyms = 1
529530
$(obj)/uapi.o: $(src)/uapi/lib.rs \
530531
$(obj)/ffi.o \
532+
$(obj)/pin_init.o \
531533
$(obj)/uapi/uapi_generated.rs FORCE
532534
+$(call if_changed_rule,rustc_library)
533535

scripts/generate_rust_analyzer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ def append_crate_with_generated(
139139
"exclude_dirs": [],
140140
}
141141

142-
append_crate_with_generated("bindings", ["core", "ffi"])
143-
append_crate_with_generated("uapi", ["core", "ffi"])
142+
append_crate_with_generated("bindings", ["core", "ffi", "pin_init"])
143+
append_crate_with_generated("uapi", ["core", "ffi", "pin_init"])
144144
append_crate_with_generated("kernel", ["core", "macros", "build_error", "pin_init", "ffi", "bindings", "uapi"])
145145

146146
def is_root_crate(build_file, target):

0 commit comments

Comments
 (0)