diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-18 14:25:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-18 14:25:54 +0000 |
| commit | 89c1e53522d21fb685ee2957226ff7c517908ef3 (patch) | |
| tree | 02baebe801d51127b8e9ca351307ea66975ac55e | |
| parent | 37627fc43b07e19e656071f17245e9b0bd1fd526 (diff) | |
| download | ruby-89c1e53522d21fb685ee2957226ff7c517908ef3.tar.gz | |
extmk.rb: fix with-ext condition
* ext/extmk.rb: configure intersection of with-ext and not
without-ext, as withouts is no longer true by default if
with-ext option is given. [ruby-dev:49108] [Bug #11280]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | ext/extmk.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Jun 18 23:25:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb: configure intersection of with-ext and not + without-ext, as withouts is no longer true by default if + with-ext option is given. [ruby-dev:49108] [Bug #11280] + Thu Jun 18 23:20:46 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * include/ruby/ruby.h: $SAFE=2 is now obsolete. diff --git a/ext/extmk.rb b/ext/extmk.rb index 98fd76ca68..84fd950d40 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -514,7 +514,7 @@ withes, withouts = [["--with", nil], ["--without", default_exclude_exts]].collec } cond = proc {|ext, *| cond1 = proc {|n| File.fnmatch(n, ext)} - withes.call(cond1) or !withouts.call(cond1) + withes.call(cond1) and !withouts.call(cond1) } ($extension || %w[*]).each do |e| e = e.sub(/\A(?:\.\/)+/, '') |