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

ruby-changes:64741

From: Yusuke <ko1@a...>
Date: Tue, 5 Jan 2021 10:22:44 +0900 (JST)
Subject: [ruby-changes:64741] 449ef72cb9 (master): configure.ac: Stop auto-detection of __ANDROID_API__ when cross-compiling

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

From 449ef72cb97ae57e57c523d2252528f8eb7b9d3e Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Tue, 5 Jan 2021 10:16:05 +0900
Subject: configure.ac: Stop auto-detection of __ANDROID_API__ when
 cross-compiling

A patch from Tee KOBAYASHI <xtkoba+ruby@g...>. [Bug #17491]

diff --git a/configure.ac b/configure.ac
index c143c23..e1e59f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,11 +457,13 @@ AC_TRY_COMPILE([ https://github.com/ruby/ruby/blob/trunk/configure.ac#L457
 [
 	AC_MSG_RESULT(yes)
 	target_os=${target_os}-android
-	AC_MSG_CHECKING([for Android API version])
-        # hacky workaround: https://github.com/termux/termux-packages/issues/6176
-        rb_android_api=`getprop ro.build.version.sdk`
-        AC_MSG_RESULT($rb_android_api)
-        RUBY_APPEND_OPTIONS(CPPFLAGS, -D__ANDROID_API__=$rb_android_api -Wno-macro-redefined)
+	AS_IF([test "x$cross_compiling" = xno], [
+                AC_MSG_CHECKING([for Android API version])
+                # hacky workaround: https://github.com/termux/termux-packages/issues/6176
+                rb_android_api=`getprop ro.build.version.sdk`
+                AC_MSG_RESULT($rb_android_api)
+                RUBY_APPEND_OPTIONS(CPPFLAGS, -D__ANDROID_API__=$rb_android_api -Wno-macro-redefined)
+	])
 ])
 
 AC_SUBST(RM, ['rm -f'])
-- 
cgit v0.10.2


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

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