diff --git a/makefiles/cargo-targets.inc.mk b/makefiles/cargo-targets.inc.mk index c12518bf28..4d56f79d5a 100644 --- a/makefiles/cargo-targets.inc.mk +++ b/makefiles/cargo-targets.inc.mk @@ -51,7 +51,6 @@ $(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= RIOT_COMPILE_COMMANDS_JSON="$(CARGO_COMPILE_COMMANDS)" RIOT_USEMODULE="$(USEMODULE)" cargo $(patsubst +,,+${CARGO_CHANNEL}) build --target $(RUST_TARGET) `if [ x$(CARGO_PROFILE) = xrelease ]; then echo --release; else if [ x$(CARGO_PROFILE) '!=' xdebug ]; then echo "--profile $(CARGO_PROFILE)"; fi; fi` $(CARGO_OPTIONS) $(Q)CC= CFLAGS= CPPFLAGS= CXXFLAGS= \ RIOT_COMPILE_COMMANDS_JSON="$(CARGO_COMPILE_COMMANDS)" \ RIOT_USEMODULE="$(USEMODULE)" \ diff --git a/makefiles/info.inc.mk b/makefiles/info.inc.mk index b392e5c77c..cc2e123423 100644 --- a/makefiles/info.inc.mk +++ b/makefiles/info.inc.mk @@ -5,6 +5,7 @@ info-debug-variable-% info-toolchains-supported \ check-toolchain-supported \ info-programmers-supported \ + info-rust \ create-Makefile.ci \ # @@ -82,13 +83,16 @@ info-build: @echo -e 'INCLUDES:$(patsubst %, \n\t%, $(INCLUDES))' @echo '' @echo 'CC: $(CC)' - @echo -e 'CFLAGS:$(patsubst %, \n\t%, $(CFLAGS))' + @echo 'CFLAGS:$(patsubst %, \n\t%, $(subst ','"'"',$(CFLAGS)))' @echo '' @echo 'CXX: $(CXX)' @echo -e 'CXXUWFLAGS:$(patsubst %, \n\t%, $(CXXUWFLAGS))' @echo -e 'CXXEXFLAGS:$(patsubst %, \n\t%, $(CXXEXFLAGS))' @echo '' @echo 'RUST_TARGET: $(RUST_TARGET)' + @echo 'CARGO_CHANNEL: $(CARGO_CHANNEL)' + @echo 'CARGO_PROFILE: $(CARGO_PROFILE)' + @echo 'CARGO_OPTIONS: $(CARGO_OPTIONS)' @echo '' @echo 'LINK: $(LINK)' @echo -e 'LINKFLAGS:$(patsubst %, \n\t%, $(LINKFLAGS))' @@ -241,3 +245,7 @@ check-toolchain-supported: info-programmers-supported: @echo $(sort $(PROGRAMMERS_SUPPORTED)) + +info-rust: + cargo $(patsubst +,,+${CARGO_CHANNEL}) version + c2rust --version