diff --git a/inst/templates/Makevars b/inst/templates/Makevars index 07ed90f4..fbd14570 100644 --- a/inst/templates/Makevars +++ b/inst/templates/Makevars @@ -17,7 +17,7 @@ $(STATLIB): export CARGO_HOME=$(CARGOTMP); \ fi && \ export PATH="$(PATH):$(HOME)/.cargo/bin" && \ - cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) + cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ rm -Rf $(LIBDIR)/build; \ diff --git a/inst/templates/Makevars.win b/inst/templates/Makevars.win index e47a9ab2..9a9b2586 100644 --- a/inst/templates/Makevars.win +++ b/inst/templates/Makevars.win @@ -27,7 +27,7 @@ $(STATLIB): fi && \ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \ - cargo build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) + cargo build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR); if [ "$(NOT_CRAN)" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ rm -Rf $(LIBDIR)/build; \ diff --git a/inst/templates/cran/Makevars b/inst/templates/cran/Makevars index e2dc513e..c8178495 100644 --- a/inst/templates/cran/Makevars +++ b/inst/templates/cran/Makevars @@ -24,9 +24,8 @@ $(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`; + 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..0caee799 100644 --- a/inst/templates/cran/Makevars.win +++ b/inst/templates/cran/Makevars.win @@ -33,10 +33,9 @@ $(STATLIB): if [ "$(NOT_CRAN)" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ - export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ + 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