diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 19:55:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 19:55:03 +0000 |
| commit | 8fd8253de904a5cdd667952239d50dc649c7b53e (patch) | |
| tree | 8edddcfe17f18ec5260d2fb593124010d6fcf445 | |
| parent | 0865b21beac76573fb98987850d76e77ece39278 (diff) | |
| download | ruby-8fd8253de904a5cdd667952239d50dc649c7b53e.tar.gz ruby-8fd8253de904a5cdd667952239d50dc649c7b53e.tar.xz ruby-8fd8253de904a5cdd667952239d50dc649c7b53e.zip | |
* ext/extmk.rb: Proc#call does not pass the block in 1.8.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/extmk.rb | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -1,10 +1,12 @@ -Sat Sep 9 04:47:45 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Sep 9 04:54:42 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT. * mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress warnings with $VERBOSE. + * ext/extmk.rb: Proc#call does not pass the block in 1.8. + * win32/resource.rb: add more info. Fri Sep 8 10:03:59 2006 GOTOU Yuuzou <gotoyuzo@notwork.org> diff --git a/ext/extmk.rb b/ext/extmk.rb index f901805fd..615bb13ad 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -373,12 +373,12 @@ else elsif (w = w.grep(String)).empty? proc {true} else - w.collect {|opt| opt.split(/,/)}.flatten.method(:any?) + proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)} end } cond = proc {|ext| cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)} - withes.call(&cond1) or !withouts.call(&cond1) + withes.call(cond1) or !withouts.call(cond1) } exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d| d = File.dirname(d) |