moved echo statements to directly before cargo build is called

extendr · Sep 24, 2024 · 3db73da · 3db73da
1 parent e847712
commit 3db73da
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/inst/templates/Makevars b/inst/templates/Makevars
@@ -17,7 +17,8 @@ $(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)
+            echo `cargo --version` && echo `rustc --version` && \
+            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
@@ -27,7 +27,8 @@ $(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)
+		echo `cargo --version` && echo `rustc --version` && \
+		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
@@ -24,8 +24,8 @@ $(STATLIB):
 	if [ "$(NOT_CRAN)" != "true" ]; then \
 		export CARGO_HOME=$(CARGOTMP); \
 	fi && \
-        echo `cargo --version` && echo `rustc --version` && \
-            export PATH="$(PATH):$(HOME)/.cargo/bin" && \
+        export PATH="$(PATH):$(HOME)/.cargo/bin" && \
+            echo `cargo --version` && echo `rustc --version` && \
 			cargo build $(CRAN_FLAGS) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR);
 		rm -Rf $(CARGOTMP) $(VENDOR_DIR) $(LIBDIR)/build; \
 

diff --git a/inst/templates/cran/Makevars.win b/inst/templates/cran/Makevars.win
@@ -33,9 +33,9 @@ $(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 CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
 		export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock"; \
+		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; \