diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-01 22:38:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-01 22:38:45 +0000 |
| commit | 546b6d7e9c73aef375b094fd852bfbe4f3c02cb5 (patch) | |
| tree | 85ae26ce344c7a483c109755908c26697920af9c | |
| parent | 0f41699c5849048fa562bcb8ce2bcae89ad8932d (diff) | |
* lib/mkmf.rb (dir_config): should not modify argument arrays
themselves.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Sun May 2 07:38:43 2010 Nobuyoshi Nakada <[email protected]> + + * lib/mkmf.rb (dir_config): should not modify argument arrays + themselves. + Thu Apr 29 18:39:51 2010 Nobuyoshi Nakada <[email protected]> * lib/thwait.rb (ThreadsWait#join): refined rdoc again. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index bef627ab02..aa720ba962 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1304,7 +1304,7 @@ def dir_config(target, idefault=nil, ldefault=nil) ldir = with_config(target + "-lib", ldefault) $arg_config.last[1] ||= "${#{target}-dir}/lib" - idirs = idir ? Array === idir ? idir : idir.split(File::PATH_SEPARATOR) : [] + idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : [] if defaults idirs.concat(defaults.collect {|d| d + "/include"}) idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR) @@ -1317,7 +1317,7 @@ def dir_config(target, idefault=nil, ldefault=nil) end end - ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : [] + ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : [] if defaults ldirs.concat(defaults.collect {|d| d + "/lib"}) ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-04-30" +#define RUBY_RELEASE_DATE "2010-05-02" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100430 +#define RUBY_RELEASE_CODE 20100502 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 -#define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_MONTH 5 +#define RUBY_RELEASE_DAY 2 #define NO_STRING_LITERAL_CONCATENATION 1 #ifdef RUBY_EXTERN |