summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-01-22 23:40:32 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-01-22 23:40:32 +0900
commite34eb58ac71ddac2d90315b35adfb2c0bf880369 (patch)
tree90f57472f673ae179c475e6a8507fdc5563b6294
parentf1c36f2e6b0cd24dbcc9faf81a2ab88040eded2c (diff)
Keep ARCH_OPTION for arm64
-rw-r--r--tool/m4/ruby_default_arch.m41
-rw-r--r--tool/m4/ruby_universal_arch.m42
2 files changed, 2 insertions, 1 deletions
diff --git a/tool/m4/ruby_default_arch.m4 b/tool/m4/ruby_default_arch.m4
index a53bb5fc41..a9e7177fda 100644
--- a/tool/m4/ruby_default_arch.m4
+++ b/tool/m4/ruby_default_arch.m4
@@ -2,6 +2,7 @@
AC_DEFUN([RUBY_DEFAULT_ARCH], [
AC_MSG_CHECKING([arch option])
AS_CASE([$1],
+ [arm64], [],
[*64], [ARCH_FLAG=-m64],
[[i[3-6]86]], [ARCH_FLAG=-m32],
[AC_MSG_ERROR(unknown target architecture: $target_archs)]
diff --git a/tool/m4/ruby_universal_arch.m4 b/tool/m4/ruby_universal_arch.m4
index dd9ad7ee46..e2f698cbc0 100644
--- a/tool/m4/ruby_universal_arch.m4
+++ b/tool/m4/ruby_universal_arch.m4
@@ -39,7 +39,7 @@ AS_IF([test ${target_archs+set}], [
echo 'int main(){return 0;}' > conftest.c
AS_IF([$CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1], [
rm -fr conftest.*
- ], [
+ ], [test -z "$ARCH_FLAG"], [
RUBY_DEFAULT_ARCH("$target_archs")
])
])