diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | test/mkmf/test_framework.rb | 4 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Sat Aug 3 22:46:19 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. + Sat Aug 3 22:40:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (have_framework): allow header file to check. 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 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-08-03" -#define RUBY_PATCHLEVEL 286 +#define RUBY_PATCHLEVEL 287 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 8 |