From 01629be72989a4082ef66c2becf1ff215eb46230 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 9 Jan 2010 19:41:22 +0000 Subject: [PATCH] * lib/mkmf.rb (configuration): needs ARCH_FLAG. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/mkmf.rb | 4 ++-- version.h | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 709cdbf1bb..b539661c02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jan 10 04:41:20 2010 Nobuyoshi Nakada + + * lib/mkmf.rb (configuration): needs ARCH_FLAG. + Sat Jan 9 14:20:54 2010 NAKAMURA Usaku * common.mk (install-all): maybe typo. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 895bca0bee..2fea9e181e 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1469,8 +1469,8 @@ CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} ldflags = #{$LDFLAGS} dldflags = #{$DLDFLAGS} -archflag = #{$ARCH_FLAG} -DLDFLAGS = $(ldflags) $(dldflags) $(archflag) +ARCH_FLAG = #{$ARCH_FLAG} +DLDFLAGS = $(ldflags) $(dldflags) LDSHARED = #{CONFIG['LDSHARED']} LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'} AR = #{CONFIG['AR']} diff --git a/version.h b/version.h index 99df622fc1..913a2b51cd 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-01-09" +#define RUBY_RELEASE_DATE "2010-01-10" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #include "ruby/version.h"