kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkmf.rb: expand all macros

Browse source 
* 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
This commit is contained in:
nobu 2013-07-29 05:52:53 +00:00
parent 3168bfe856
commit fcb58bdb38
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Jul 29 14:52:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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.
Mon Jul 29 06:54:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jul 29 06:54:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_pipe): use enum for compile time constants, * win32/win32.c (rb_w32_pipe): use enum for compile time constants,

2
lib/mkmf.rb
View file

@ -378,7 +378,7 @@ module MakeMakefile
def xsystem command, opts = nil def xsystem command, opts = nil
varpat = /\$\((\w+)\)|\$\{(\w+)\}/ varpat = /\$\((\w+)\)|\$\{(\w+)\}/
if varpat =~ command if varpat =~ command
vars = Hash.new {|h, k| h[k] = ''; ENV[k]} vars = Hash.new {|h, k| h[k] = ENV[k]}
command = command.dup command = command.dup
nil while command.gsub!(varpat) {vars[$1||$2]} nil while command.gsub!(varpat) {vars[$1||$2]}
end end

4
test/mkmf/test_framework.rb
View file

@ -12,8 +12,8 @@ class TestMkmf
File.write(src, "void #{fw}(void) {}") File.write(src, "void #{fw}(void) {}")
cmd = LINK_SO.dup cmd = LINK_SO.dup
RbConfig.expand(cmd, RbConfig::CONFIG.merge("OBJS"=>src)) RbConfig.expand(cmd, RbConfig::CONFIG.merge("OBJS"=>src))
cmd.sub!("$@", "#{fwdir}/#{fw}") cmd.gsub!("$@", "#{fwdir}/#{fw}")
cmd.sub!(/ -bundle /, ' -dynamiclib ') cmd.gsub!(/ -bundle /, ' -dynamiclib ')
assert(xsystem(cmd), MKMFLOG) assert(xsystem(cmd), MKMFLOG)
$INCFLAGS << " " << "-F#{dir}".quote $INCFLAGS << " " << "-F#{dir}".quote
yield fw, hdrname yield fw, hdrname