Merge branch 'master' into evm_reindex

DeFiCh · Jul 26, 2023 · 5a8e539 · 5a8e539
2 parents 32a1ce7 + 26f9d31
commit 5a8e539
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1375,19 +1375,21 @@ AC_SUBST(PROTOC)
 AC_SUBST(PROTOC_INCLUDE_DIR)
 
 dnl If the host and build triplets are the same, we keep this empty
-if test x$host = x$build; then
+RUST_HOST=`$ac_abs_confdir/make.sh get_rust_triplet "$build"`
+if test $? != 0; then
+AC_MSG_ERROR("unsupported build system")
+fi
+
+RUST_TARGET=`$ac_abs_confdir/make.sh get_rust_triplet "$host"`
+if test $? != 0; then
+AC_MSG_ERROR("unsupported host target")
+fi
+
+if test x$RUST_HOST = x$RUST_TARGET; then
   RUST_TARGET=
   RUST_HOST=
-else
-  RUST_HOST=`$ac_abs_confdir/make.sh get_rust_triplet "$build"`
-  if test $? != 0; then
-    AC_MSG_ERROR("unsupported build system")
-  fi
-  RUST_TARGET=`$ac_abs_confdir/make.sh get_rust_triplet "$host"`
-  if test $? != 0; then
-    AC_MSG_ERROR("unsupported host target")
-  fi
 fi
+
 AC_SUBST(RUST_TARGET)
 AC_SUBST(RUST_HOST)
 AM_CONDITIONAL([HAVE_RUST_TARGET], [test x$RUST_TARGET != x])

diff --git a/make.sh b/make.sh
@@ -1013,8 +1013,8 @@ get_rust_triplet() {
         x86_64-pc-linux-gnu) result=x86_64-unknown-linux-gnu;;
         aarch64-linux-gnu|aarch64-unknown-linux-gnu) result=aarch64-unknown-linux-gnu;;
         arm-linux-gnueabihf|arm-unknown-linux-gnueabihf) result=armv7-unknown-linux-gnueabihf;;
-        x86_64-apple-darwin) result=x86_64-apple-darwin;;
-        aarch64-apple-darwin) result=aarch64-apple-darwin;;
+        x86_64-apple-darwin*) result=x86_64-apple-darwin;;
+        aarch64-apple-darwin*) result=aarch64-apple-darwin;;
         x86_64-w64-mingw32) result=x86_64-pc-windows-gnu;;
         *) echo "error: unsupported triplet: ${triplet}"; exit 1;;
     esac