File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -307,20 +307,22 @@ $(obj)/%.lst: $(src)/%.c FORCE
307
307
# ---------------------------------------------------------------------------
308
308
309
309
quiet_cmd_cargo = CARGO $(quiet_modtag) $@
310
- cmd_cargo = export RUST_BINDGEN_FILE=$(shell readlink -f rust_bindings.rs) && $(CARGO) build $(cargo_flags) -p $(shell basename $(basename $(src))) --out-dir $(src)
310
+ cmd_cargo = export RUST_BINDGEN_FILE=$(shell readlink -f rust_bindings.rs) && $(CARGO) build -p $(shell basename $(basename $(src))) --out-dir $(src) $(cargo_flags )
311
311
312
312
rust_bindings.rs: FORCE
313
- $(Q)$(BINDGEN) $(srctree)/rust/kernel/src/bindings_helper.h --opaque-type xregs_state --opaque-type desc_struct --use-core --ctypes-prefix c_types -o rust_bindings.rs --size_t-is-usize -- $(c_flags)
313
+ $(Q)$(BINDGEN) $(srctree)/rust/kernel/src/bindings_helper.h --no-rustfmt-bindings -- opaque-type xregs_state --opaque-type desc_struct --use-core --ctypes-prefix c_types -o rust_bindings.rs --size_t-is-usize -- $(c_flags)
314
314
315
315
# The .o from the Rust staticlib
316
316
#$(obj)/%.o: $(src)/out/lib%.a
317
- $(obj)/%.o: $(obj)/lib%.a
317
+ $(obj)/%.o: $(obj)/lib%.a $(obj)/%.a
318
318
$(Q)$(LD) -r -o $@ --whole-archive $<
319
319
320
320
# The Rust staticlib from cargo
321
- $(obj)/lib %.a: FORCE rust_bindings.rs
321
+ $(obj)/%.a: rust_bindings.rs FORCE
322
322
$(call cmd,cargo)
323
323
324
+ $(obj)/lib%.a:
325
+
324
326
# Compile assembler sources (.S)
325
327
# ---------------------------------------------------------------------------
326
328
You can’t perform that action at this time.
0 commit comments