Skip to content

Commit

Permalink
Merge #19203
Browse files Browse the repository at this point in the history
19203: make: pass make jobserver to cargo r=kaspar030 a=kaspar030



Co-authored-by: Kaspar Schleiser <kaspar@schleiser.de>
  • Loading branch information
bors[bot] and kaspar030 authored Jan 26, 2023
2 parents 7b75351 + 6fb226d commit 2492e21
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion makefiles/cargo-targets.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ $(CARGO_LIB): $(RIOTBUILD_CONFIG_HEADER_C) $(BUILDDEPS) $(CARGO_COMPILE_COMMANDS
($(COLOR_ECHO) \
'$(COLOR_RED)Error: No Rust libraries are installed for the board'"'"'s CPU.$(COLOR_RESET) Run\n $(COLOR_GREEN)$$$(COLOR_RESET) rustup target add $(RUST_TARGET) $(patsubst %,--toolchain %,$(CARGO_CHANNEL))\nor set `CARGO_OPTIONS=-Zbuild-std=core`.'; \
exit 1)
$(Q)CC= CFLAGS= CPPFLAGS= CXXFLAGS= \
$(Q)# finally call out to cargo. mind the "+" to pass down make's jobserver.
$(Q)+ CC= CFLAGS= CPPFLAGS= CXXFLAGS= \
RIOT_COMPILE_COMMANDS_JSON="$(CARGO_COMPILE_COMMANDS)" \
RIOT_USEMODULE="$(USEMODULE)" \
cargo $(patsubst +,,+${CARGO_CHANNEL}) \
Expand Down

0 comments on commit 2492e21

Please sign in to comment.