rust/Makefile: add RUSTC and RUSTDOC to CARGO_ENV

And consistently use the CARGO_ENV for all cargo calls.

This allows a user to point to rust binaries that are not on their
path just during ./configure, for example:

  PATH=/usr/lib/rust-1.89/bin:$PATH ./configure ...

The full path to rustc and rustdoc will now be used, as discovered in
the PATH without the user have to carry the path over to the "make"
command. This was already done for cargo.

Related to ticket: OISF#8381

(cherry picked from commit d5f6df0)

Author: jasonish

rust/Makefile.am

@@ -47,13 +47,15 @@ if RUST_CROSS_COMPILE
 RUST_TARGET = --target $(host_triplet)
 endif
 
+CARGO_ENV =	RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)"
+
 if HAVE_CYGPATH
-CARGO_ENV =	@rustup_home@ \
+CARGO_ENV +=	@rustup_home@ \
 		CARGO_HOME="$(CARGO_HOME)" \
 		CARGO_TARGET_DIR="$(e_rustdir)/target" \
 		SURICATA_LUA_SYS_HEADER_DST="$(e_rustdir)/gen"
 else
-CARGO_ENV =	@rustup_home@ \
+CARGO_ENV +=	@rustup_home@ \
 		CARGO_HOME="$(CARGO_HOME)" \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \
 		SURICATA_LUA_SYS_HEADER_DST="$(abs_top_builddir)/rust/gen"
@@ -124,7 +126,7 @@ endif
 
 check:
 	cd $(abs_top_srcdir)/rust && \
-		$(CARGO_ENV) RUSTDOC=$(RUSTDOC) \
+		$(CARGO_ENV) \
 		$(CARGO) test --all $(RELEASE) --features "$(RUST_FEATURES)"
 	$(MAKE) check-bindgen-bindings
 
@@ -172,7 +174,7 @@ endif
 if HAVE_CBINDGEN
 gen/rust-bindings.h: $(RUST_SURICATA_LIB) cbindgen.toml
 	cd $(abs_top_srcdir)/rust && \
-		CARGO=$(CARGO) $(CBINDGEN) --config $(abs_top_srcdir)/rust/cbindgen.toml \
+		$(CARGO_ENV) CARGO=$(CARGO) $(CBINDGEN) --config $(abs_top_srcdir)/rust/cbindgen.toml \
 		--quiet --verify --output $(abs_top_builddir)/rust/gen/rust-bindings.h || true
 else
 gen/rust-bindings.h:
@@ -181,18 +183,18 @@ endif
 if HAVE_CBINDGEN
 gen/htp/htp_rs.h: $(RUST_SURICATA_LIB) htp/cbindgen.toml
 	cd $(abs_top_srcdir)/rust/htp && \
-		CARGO=$(CARGO) $(CBINDGEN) --config $(abs_top_srcdir)/rust/htp/cbindgen.toml \
+		$(CARGO_ENV) CARGO=$(CARGO) $(CBINDGEN) --config $(abs_top_srcdir)/rust/htp/cbindgen.toml \
 		--quiet --verify --output $(abs_top_builddir)/rust/gen/htp/htp_rs.h || true
 else
 gen/htp/htp_rs.h:
 endif
 
 doc:
-	CARGO_HOME=$(CARGO_HOME) RUSTDOC=$(RUSTDOC) $(CARGO) doc --all-features --no-deps
+	$(CARGO_ENV) $(CARGO) doc --all-features --no-deps
 
 if HAVE_CBINDGEN
 dist/rust-bindings.h:
-	CARGO=$(CARGO) $(CBINDGEN) --config $(abs_top_srcdir)/rust/cbindgen.toml \
+	$(CARGO_ENV) CARGO=$(CARGO) $(CBINDGEN) --config $(abs_top_srcdir)/rust/cbindgen.toml \
 		--quiet --output $(abs_top_builddir)/rust/dist/rust-bindings.h
 else
 dist/rust-bindings.h:
@@ -201,7 +203,7 @@ endif
 if HAVE_CBINDGEN
 dist/htp/htp_rs.h:
 	cd $(abs_top_srcdir)/rust/htp && \
-	CARGO=$(CARGO) $(CBINDGEN) --config cbindgen.toml \
+	$(CARGO_ENV) CARGO=$(CARGO) $(CBINDGEN) --config cbindgen.toml \
 		--quiet --output $(abs_top_builddir)/rust/dist/htp/htp_rs.h
 else
 dist/htp/htp_rs.h:
@@ -210,5 +212,5 @@ endif
 Cargo.toml: Cargo.toml.in
 
 update-lock: Cargo.toml
-	$(CARGO) update
+	$(CARGO_ENV) $(CARGO) update
 	mv Cargo.lock Cargo.lock.in