diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -1,4 +1,7 @@ -Wed May 15 17:04:11 2013 Koichi Sasada <ko1@atdot.net> +Wed May 15 17:55:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_PLATFORM): move to config.h as needed by + version.c. * gc.c: add an additional RGENGC_PROFILE mode (2). Profiling result can be check by GC.stat. diff --git a/configure.in b/configure.in index 64e065d48d..d5536089b7 100644 --- a/configure.in +++ b/configure.in @@ -3616,7 +3616,7 @@ if test "${universal_binary-no}" = yes ; then 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__ !<verconf>!) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__) else for archs in ${universal_archnames}; do cpu=`echo $archs | sed 's/.*=//'` @@ -3628,12 +3628,12 @@ if test "${universal_binary-no}" = yes ; then test "$ac_cv_type_long_long" = yes && ints="'long long' $ints" AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}") AC_SUBST(UNIVERSAL_INTS, "${ints}") - AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}" !<verconf>!) - AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS !<verconf>!) - AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS !<verconf>!) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}") + AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS) else arch="${target_cpu}-${target_os}" - AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}" !<verconf>!) + AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}") fi unset sitearch |