1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

configure.in: move RUBY_PLATFORM to config.h

* configure.in (RUBY_PLATFORM): move to config.h as needed by
  version.c.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-05-15 08:56:28 +00:00
parent 5780d88175
commit 1ad7cbbf64
2 changed files with 9 additions and 6 deletions

View file

@ -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). * gc.c: add an additional RGENGC_PROFILE mode (2).
Profiling result can be check by GC.stat. Profiling result can be check by GC.stat.

View file

@ -3616,7 +3616,7 @@ if test "${universal_binary-no}" = yes ; then
AC_TRY_COMPILE([const char arch[] = __ARCHITECTURE__;], [puts(arch);], AC_TRY_COMPILE([const char arch[] = __ARCHITECTURE__;], [puts(arch);],
[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no])) [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
if test "${rb_cv_architecture_available}" = yes; then if test "${rb_cv_architecture_available}" = yes; then
AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__ !<verconf>!) AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
else else
for archs in ${universal_archnames}; do for archs in ${universal_archnames}; do
cpu=`echo $archs | sed 's/.*=//'` 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" test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}") AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
AC_SUBST(UNIVERSAL_INTS, "${ints}") AC_SUBST(UNIVERSAL_INTS, "${ints}")
AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}" !<verconf>!) AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS !<verconf>!) AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS)
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS !<verconf>!) AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
else else
arch="${target_cpu}-${target_os}" arch="${target_cpu}-${target_os}"
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}" !<verconf>!) AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
fi fi
unset sitearch unset sitearch