From 5f2ebbe9490fd3cef732c77e38eb20ede511f79a Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Thu, 22 Aug 2019 14:23:08 +0000
Subject: [PATCH] Use AC_CHECK_TOOL for as and allow configure parameter.

This way we auto-detect a cross-assembler more easily with, e.g.,
--build=aarch64--netbsd.
---
 src/microcode/configure.ac           | 10 ++++++++++
 src/microcode/makegen/Makefile.in.in |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index f4a98cf42..49f78a396 100644
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -180,6 +180,7 @@ SAVED_CFLAGS=${CFLAGS}
 SAVED_LDFLAGS=${LDFLAGS}
 
 dnl Checks for programs.
+AC_CHECK_TOOL(AS, as)
 AC_PROG_CC
 AC_PROG_CC_STDC
 if test "x${ac_cv_prog_cc_c99}" != xno; then
@@ -272,6 +273,15 @@ CCLD=${CC}
 MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}])
 MIT_SCHEME_COMPILER_TARGET([${with_compiler_target}])
 
+case $mit_scheme_native_code in
+c|svm1-be|svm1-le);;
+*)
+    if test "x${AS}" = x; then
+        AC_MSG_ERROR([Unable to find assembler for native code interface])
+    fi
+    ;;
+esac
+
 AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
 EXE_NAME=mit-scheme-${mit_scheme_native_code}
 
diff --git a/src/microcode/makegen/Makefile.in.in b/src/microcode/makegen/Makefile.in.in
index aafac46b4..0b19ba0e3 100644
--- a/src/microcode/makegen/Makefile.in.in
+++ b/src/microcode/makegen/Makefile.in.in
@@ -72,7 +72,7 @@ CC = @CC@
 HOST_CC = @HOST_CC@
 CCLD = @CCLD@
 M4 = $(srcdir)/makegen/m4.sh @M4@
-AS = as
+AS = @AS@
 TAR = tar
 GZIP_ENV = --best
 
-- 
2.25.1