[前][次][番号順一覧][スレッド一覧]

ruby-changes:65000

From: Nobuyoshi <ko1@a...>
Date: Fri, 22 Jan 2021 23:46:52 +0900 (JST)
Subject: [ruby-changes:65000] e34eb58ac7 (master): Keep ARCH_OPTION for arm64

https://git.ruby-lang.org/ruby.git/commit/?id=e34eb58ac7

From e34eb58ac71ddac2d90315b35adfb2c0bf880369 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 22 Jan 2021 23:40:32 +0900
Subject: Keep ARCH_OPTION for arm64


diff --git a/tool/m4/ruby_default_arch.m4 b/tool/m4/ruby_default_arch.m4
index a53bb5f..a9e7177 100644
--- a/tool/m4/ruby_default_arch.m4
+++ b/tool/m4/ruby_default_arch.m4
@@ -2,6 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_default_arch.m4#L2
 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 dd9ad7e..e2f698c 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}], [ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_universal_arch.m4#L39
 	    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")
 	    ])
 	])
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]