diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-03 03:17:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-03 03:17:50 +0000 |
| commit | a7a0b3ad52e264d08e1b26a6bad9b9bba2a99c1b (patch) | |
| tree | 076124951451edcabca0ca71cf65c138060a5129 /lib | |
| parent | 2a5b45ddc5e533ed69e656a4d384c1d4dd0dbac6 (diff) | |
ext_conf_builder.rb: remove circular dependency in install-so
* lib/rubygems/ext/ext_conf_builder.rb
(Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove
circular dependencies in install-so too. [ruby-core:52882]
[Bug #7698]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/ext/ext_conf_builder.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 67f1e08a8c..7babf409a0 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -18,6 +18,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder changed |= mf.gsub!(/^(install-rb-default:)(.*)/) { "#$1#{$2.gsub(/(?:^|\s+)\$\(RUBY(?:ARCH|LIB)DIR\)\/\S+(?=\s|$)/, '')}" } + changed |= mf.gsub!(/^(install-so:.*DLLIB.*\n)((?:\t.*\n)+)/) { + "#$1#{$2.gsub(/.*INSTALL.*DLLIB.*\n/, '')}" + } if changed File.open('Makefile', 'wb') {|f| f.print mf} end |