summaryrefslogtreecommitdiff
path: root/test/mkmf
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-29 05:52:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-29 05:52:53 +0000
commitfcb58bdb3826a3ba6eaeb133313fea148d843926 (patch)
treed3bf62030a08d1d0c93d1c08ca867fe06ab0046c /test/mkmf
parent3168bfe85661c5927240e31ca7f00b046e459667 (diff)
mkmf.rb: expand all macros
* 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/trunk@42223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/mkmf')
-rw-r--r--test/mkmf/test_framework.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mkmf/test_framework.rb b/test/mkmf/test_framework.rb
index 1b595aa..48e8bf7 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