diff --git a/inst/templates/cran/Makevars b/inst/templates/cran/Makevars index e2dc513e..1eac0338 100644 --- a/inst/templates/cran/Makevars +++ b/inst/templates/cran/Makevars @@ -24,9 +24,9 @@ $(STATLIB): if [ "$(NOT_CRAN)" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ - export PATH="$(PATH):$(HOME)/.cargo/bin" && \ - cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) && \ - echo `cargo --version` && echo `rustc --version`; + echo `cargo --version` && echo `rustc --version` && \ + export PATH="$(PATH):$(HOME)/.cargo/bin" && \ + cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ C_clean: diff --git a/inst/templates/cran/Makevars.win b/inst/templates/cran/Makevars.win index f19bb836..8eb69e4c 100644 --- a/inst/templates/cran/Makevars.win +++ b/inst/templates/cran/Makevars.win @@ -33,10 +33,10 @@ $(STATLIB): if [ "$(NOT_CRAN)" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ + echo `cargo --version` && echo `rustc --version` && \ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock"; \ - cargo build $(CRAN_FLAGS) --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) && \ - echo `cargo --version` && echo `rustc --version`; + cargo build $(CRAN_FLAGS) --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \ fi