diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-03 13:50:36 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-03 13:50:36 +0000 |
| commit | 83466682e292cf7f0faeacd945f37829707b80a6 (patch) | |
| tree | 52592d1c1a01374e9b34304380b8a8da58c66b61 /lib | |
| parent | ab660694feb8128c8a1c5bdadea21acb5af89810 (diff) | |
merge revision(s) 42223: [Backport #8702]
* lib/mkmf.rb (xsystem): expand environment variable in all macros not
expanded with RbConfig. [Bug #8702]
* test/mkmf/test_framework.rb (create_framework): replace all $@ not
only once.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8ea4d8eb32..03ff262d25 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -352,7 +352,7 @@ module MakeMakefile def xsystem command, opts = nil varpat = /\$\((\w+)\)|\$\{(\w+)\}/ if varpat =~ command - vars = Hash.new {|h, k| h[k] = ''; ENV[k]} + vars = Hash.new {|h, k| h[k] = ENV[k]} command = command.dup nil while command.gsub!(varpat) {vars[$1||$2]} end |