diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Sat Mar 28 03:16:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (link_command, cc_command, cpp_command): should no + override extout defined in extmk.rb. + Fri Mar 27 12:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (what_type?): checks more restrictively, and diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 9153a3510d..a9dc120670 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -372,7 +372,6 @@ end def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => CONFTEST_C, - 'extout' => $extout, 'arch_hdrdir' => "#$arch_hdrdir", 'top_srcdir' => $top_srcdir.quote, 'INCFLAGS' => "#$INCFLAGS", @@ -388,7 +387,6 @@ end def cc_command(opt="") conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote, - 'extout' => $extout, 'arch_hdrdir' => "#$arch_hdrdir", 'top_srcdir' => $top_srcdir.quote) RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", @@ -397,7 +395,6 @@ end def cpp_command(outfile, opt="") conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote, - 'extout' => $extout, 'arch_hdrdir' => "#$arch_hdrdir", 'top_srcdir' => $top_srcdir.quote) RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-03-27" +#define RUBY_RELEASE_DATE "2009-03-28" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 28 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |