diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-27 02:07:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-27 02:07:40 +0000 |
| commit | 8dda9460590abbde03d813ee684dfdd147f3d31d (patch) | |
| tree | 5e216cf76f4e23d81b8c12ed973dd86585ed3900 /configure.in | |
| parent | f939ec3522bd123084ca7668729a874a3bdd7f99 (diff) | |
configure.in: check __ARCHITECTURE__ properly
* configure.in (rb_cv_architecture_available): check whether
__ARCHITECTURE__ is available before replacing CFLAGS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index f13f550be7..3dfe0ab8fe 100644 --- a/configure.in +++ b/configure.in @@ -3548,6 +3548,10 @@ if test "${universal_binary-no}" = yes ; then 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_configure_args}" | sed 's/\\$/$$/g'`")dnl 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 |