aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-15 03:12:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-15 03:12:28 +0000
commitc59abe419d77c6e9346467f47d9b2e60bd45d7fc (patch)
tree0b36c04ff119b1e5b16d77b7766ee46f55d0b083
parentf9b71b888ca77739cbffd79709bef1289cccaf3f (diff)
downloadruby-c59abe419d77c6e9346467f47d9b2e60bd45d7fc.tar.gz
* configure.in (RUBY_USE_BUILTIN_FRAME_ADDRESS): check after real
target CPU is set. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bdd4da7483..4004db6268 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Tue Sep 15 12:01:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Sep 15 12:12:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_USE_BUILTIN_FRAME_ADDRESS): check after real
+ target CPU is set.
* configure.in (RUBY_UNIVERSAL_ARCH): check real target CPU after
AC_PROG_CC.
diff --git a/configure.in b/configure.in
index 1dc3533b25..03a03050e5 100644
--- a/configure.in
+++ b/configure.in
@@ -231,6 +231,7 @@ EOF
fi
])
+AC_DEFUN([RUBY_USE_BUILTIN_FRAME_ADDRESS], [
case $target_cpu in
when(i?86) frame_address=yes;;
when(*) frame_address=no;;
@@ -241,6 +242,7 @@ AC_ARG_ENABLE(frame-address,
if test $frame_address = yes; then
AC_DEFINE(USE_BUILTIN_FRAME_ADDRESS)
fi
+])
AC_ARG_ENABLE(load-relative,
AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
@@ -288,6 +290,7 @@ AC_SUBST(COUTFLAG)
RUBY_MINGW32
RUBY_UNIVERSAL_ARCH
+RUBY_USE_BUILTIN_FRAME_ADDRESS
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(AR, ar)