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

merges r29066 from trunk into ruby_1_9_2.

--
* configure.in: fix typo.  a patch from Eric Wong at
  [ruby-core:31810].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-09-29 12:25:31 +00:00
parent 2fd98b1d3e
commit 99f18d4d69
3 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Sun Aug 22 05:55:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: fix typo. a patch from Eric Wong at
[ruby-core:31810].
Thu Aug 19 12:04:39 2010 Kenta Murata <mrkn@mrkn.jp>
* array.c (rb_ary_permutation, rb_ary_repeated_permutation,

View file

@ -152,7 +152,7 @@ AC_MSG_RESULT([$ARCH_FLAG])
AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
# RUBY_UNIVERSAL_ARCH begin
test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
unset ARCH_FLAG universal_binary universal_archnames
if test ${target_archs+set}; then
AC_MSG_CHECKING([target architectures])

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2010-09-29"
#define RUBY_PATCHLEVEL 4
#define RUBY_PATCHLEVEL 5
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9