diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-13 01:10:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-13 01:10:48 +0000 |
commit | 22c20cd4d9d900011b3a697654efcd46c3e06bc4 (patch) | |
tree | 6d94d66a2f2861d79b73b17d62c4f7ee6fb05935 | |
parent | 420a5fe48efdde608671395bd4eb7583a60d38ef (diff) |
* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
::CONFIG which is an alias of MAKEFILE_CONFIG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/mkmf.rb | 12 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Fri Jul 13 10:10:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand + ::CONFIG which is an alias of MAKEFILE_CONFIG. + Thu Jul 12 17:03:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * struct.c (rb_struct_init_copy): disallow changing the size. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 338b7c5242..a7247ca83b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -271,8 +271,7 @@ ensure end def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) - Config::expand(TRY_LINK.dup, - CONFIG.merge('hdrdir' => $hdrdir.quote, + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => CONFTEST_C, 'INCFLAGS' => $INCFLAGS, 'CPPFLAGS' => $CPPFLAGS, @@ -281,17 +280,20 @@ def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) 'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LIBPATH' => libpathflag(libpath), 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", - 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")) + 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS") + Config::expand(TRY_LINK.dup, conf) end def cc_command(opt="") + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", - CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) + conf) end def cpp_command(outfile, opt="") + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", - CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) + conf) end def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-07-12" +#define RUBY_RELEASE_DATE "2007-07-13" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070712 +#define RUBY_RELEASE_CODE 20070713 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |