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 | 12d39082c52dae668db8ab145d3b134b2c1e040b (patch) | |
tree | 43fa090c9d372e0800d680da81102ac3d3f97eb2 | |
parent | 3046fe65af65a5b6430e64f7d81f1748dec2d0ab (diff) | |
download | ruby-12d39082c52dae668db8ab145d3b134b2c1e040b.tar.gz |
* lib/mkmf.rb (dir_config): should not modify argument arrays
themselves.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/mkmf.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun May 2 07:38:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (dir_config): should not modify argument arrays + themselves. + Sat May 1 22:53:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/tempfile.rb (Tempfile#size): stat by path name when it is diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 3b667a68bf..47f09f2f66 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1340,7 +1340,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) @@ -1353,7 +1353,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) |