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

ruby-changes:33107

From: nobu <ko1@a...>
Date: Thu, 27 Feb 2014 11:07:47 +0900 (JST)
Subject: [ruby-changes:33107] nobu:r45186 (trunk): configure.in: check __ARCHITECTURE__ properly

nobu	2014-02-27 11:07:40 +0900 (Thu, 27 Feb 2014)

  New Revision: 45186

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45186

  Log:
    configure.in: check __ARCHITECTURE__ properly
    
    * configure.in (rb_cv_architecture_available): check whether
      __ARCHITECTURE__ is available before replacing CFLAGS.

  Modified files:
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 45185)
+++ configure.in	(revision 45186)
@@ -3548,6 +3548,10 @@ if test "${universal_binary-no}" = yes ; https://github.com/ruby/ruby/blob/trunk/configure.in#L3548
     mv -f confdefs1.h confdefs.h
     AC_MSG_ERROR([failed])
     ])])
+    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
+	AC_TRY_COMPILE([@%:@include <stdio.h>
+		const char arch[[]] = __ARCHITECTURE__;], [puts(arch);],
+		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
 fi
 
 if test "$ac_cv_func_memmem" = yes; then
@@ -3765,9 +3769,6 @@ AC_SUBST(configure_args, "`echo "${ac_co https://github.com/ruby/ruby/blob/trunk/configure.in#L3769
 
 if test "${universal_binary-no}" = yes ; then
     arch="universal-${target_os}"
-    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
-	AC_TRY_COMPILE([const char arch[] = __ARCHITECTURE__;], [puts(arch);],
-	     [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
     if test "${rb_cv_architecture_available}" = yes; then
 	AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
     else

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

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