diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-09 07:38:15 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-09 07:38:15 +0000 |
| commit | d720aebb665b2d255c98b84e87f44991c4d79e7e (patch) | |
| tree | e33a8f42ab39901768ec8fe446907793c11a5f3a /lib | |
| parent | 69492b4dcf5eb3e8c38f94bdbb4ea42ed32a2a96 (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_1_9_3@42463 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 8f4e69e429..80c1f49e66 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -300,7 +300,7 @@ end 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 |