зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
3046fe65af
Коммит
12d39082c5
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче