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 /test | |
| 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 'test')
| -rw-r--r-- | test/mkmf/test_framework.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mkmf/test_framework.rb b/test/mkmf/test_framework.rb index 1b595aab7a..48e8bf7213 100644 --- a/test/mkmf/test_framework.rb +++ b/test/mkmf/test_framework.rb @@ -12,8 +12,8 @@ class TestMkmf File.write(src, "void #{fw}(void) {}") cmd = LINK_SO.dup RbConfig.expand(cmd, RbConfig::CONFIG.merge("OBJS"=>src)) - cmd.sub!("$@", "#{fwdir}/#{fw}") - cmd.sub!(/ -bundle /, ' -dynamiclib ') + cmd.gsub!("$@", "#{fwdir}/#{fw}") + cmd.gsub!(/ -bundle /, ' -dynamiclib ') assert(xsystem(cmd), MKMFLOG) $INCFLAGS << " " << "-F#{dir}".quote yield fw, hdrname |