aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-28 02:08:18 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-28 02:08:18 +0000
commit0dcb387abe9570711af5638eac474157eddbfef2 (patch)
tree8d0975c91829058553435edbc7f3f1d73e096c22
parent96cf5ef0e41b4c6bf053f4c150134dac666e04e6 (diff)
downloadruby-0dcb387abe9570711af5638eac474157eddbfef2.tar.gz
* ext/extmk.rb: set MFLAGS from MAKEFLAGS when using nmake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xext/extmk.rb1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a965037155..e5d6464511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 28 11:07:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/extmk.rb: set MFLAGS from MAKEFLAGS when using nmake.
+
Mon Mar 28 11:07:00 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk (love): all you need is love.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 13b5ffd6ef..3aa81547d9 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -583,6 +583,7 @@ if $configure_only and $command_output
mf.puts "Q = $(Q1:0=@)"
mf.puts "ECHO1 = $(V:1=@:)"
mf.puts "ECHO = $(ECHO1:0=@echo)"
+ mf.puts "MFLAGS = -$(MAKEFLAGS)" if $nmake
mf.puts
mf.print "extensions ="