refactor(build): Update Rust build macros from another project

Author: alerque

build-aux/que_git_version.m4

@@ -9,8 +9,8 @@ AC_DEFUN_ONCE([QUE_GIT_VERSION], [
         AM_CONDITIONAL([SOURCE_IS_ARCHIVE],
                 [test ! -d .git -a ! -f .tarball-version])
 
-        AC_PROG_AWK
-        AC_PROG_GREP
+        AC_REQUIRE([AC_PROG_AWK])
+        AC_REQUIRE([AC_PROG_GREP])
 
         QUE_TRANSFORM_PACKAGE_NAME
 

build-aux/que_rust_boilerplate.am

@@ -54,11 +54,11 @@ $(COMPLETIONS_OUT_DIR)/_$(TRANSFORMED_PACKAGE_NAME).ps1: $(CARGO_BIN) | $(COMPLE
 $(COMPLETIONS_OUT_DIR)/_$(TRANSFORMED_PACKAGE_NAME): $(CARGO_BIN) | $(COMPLETIONS_OUT_DIR)
 	$(INSTALL) -m644 $$(cat $(_RUST_OUT))/$(COMPLETIONS_OUT_DIR)/_$(PACKAGE_NAME) $@
 
-$(_RUST_OUT) $(CARGO_BIN): $(@PACKAGE_VAR@_SOURCES) $(EXTRA_@PACKAGE_VAR@_SOURCES)
+$(_RUST_OUT) $(CARGO_BIN): $(@PACKAGE_VAR@_SOURCES) $(nodist_@PACKAGE_VAR@_SOURCES) $(EXTRA_@PACKAGE_VAR@_SOURCES)
 	set -e
 	export AUTOTOOLS_DEPENDENCIES="$^"
-	$(CARGO_ENV) $(CARGO) build $(CARGO_VERBOSE) $(CARGO_FEATURE_ARGS) $(CARGO_RELEASE_ARGS)
-	$(CARGO_ENV) $(CARGO) build --quiet --message-format=json $(CARGO_FEATURE_ARGS) $(CARGO_RELEASE_ARGS) | \
+	$(CARGO_ENV) $(CARGO) build $(CARGO_VERBOSE) --target $(CARGO_TARGET_TRIPLE) $(CARGO_FEATURE_ARGS) $(CARGO_RELEASE_ARGS)
+	$(CARGO_ENV) $(CARGO) build  --target $(CARGO_TARGET_TRIPLE) --quiet --message-format=json $(CARGO_FEATURE_ARGS) $(CARGO_RELEASE_ARGS) | \
 		$(JQ) -sr 'map(select(.reason == "build-script-executed")) | last | .out_dir' > $(_RUST_OUT)
 
 RUST_DEVELOPER_TARGETS = cargo-test clippy rustfmt

build-aux/que_rust_boilerplate.m4

@@ -10,25 +10,28 @@ AC_DEFUN_ONCE([QUE_RUST_BOILERPLATE], [
         AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"])
 
         AC_MSG_NOTICE([checking for tools used by automake to build Rust projects])
-        AC_PROG_INSTALL
-        AC_PROG_SED
+        AC_REQUIRE([AC_PROG_INSTALL])
+        AC_REQUIRE([AC_PROG_SED])
         AX_REQUIRE_PROG([cargo])
         AX_REQUIRE_PROG([jq])
         AX_REQUIRE_PROG([rustc])
-        AX_REQUIRE_PROG([cmp])
         AX_REQUIRE_PROG([xargs])
         AM_COND_IF([DEVELOPER_MODE], [
                 AX_REQUIRE_PROG([git])
                 AX_REQUIRE_PROG([rustfmt])
         ])
 
+        AC_ARG_VAR(CARGO_TARGET_TRIPLE, "Target triple for Rust compilations")
+        if test -z "$CARGO_TARGET_TRIPLE"; then
+                CARGO_TARGET_TRIPLE="$($RUSTC -vV | $SED -n 's/host: //p')"
+        fi
         AC_MSG_CHECKING([whether to build Rust code with debugging information])
         AM_COND_IF([DEBUG_RELEASE], [
                 AC_MSG_RESULT(yes)
-                RUST_TARGET_SUBDIR=debug
+                RUST_TARGET_SUBDIR=$CARGO_TARGET_TRIPLE/debug
         ], [
                 AC_MSG_RESULT(no)
-                RUST_TARGET_SUBDIR=release
+                RUST_TARGET_SUBDIR=$CARGO_TARGET_TRIPLE/release
         ])
         AC_SUBST([RUST_TARGET_SUBDIR])