summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-27 03:16:30 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-27 03:16:30 +0000
commitc5158538e7b60d9339f64432257f5d6e632e8e7f (patch)
treeb95bcc357a9a086553fcf5400f2fe09ebcaf25ed
parentaefc03ba1e8e5e614d09cf889c3efa5c8d71bf2d (diff)
* common.mk (EXTMK_ARGS): specify to pass macro V, because nmake
doesn't pass it via MAKEFLAGS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c028f108fb..74e4cdacd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 27 12:14:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * common.mk (EXTMK_ARGS): specify to pass macro V, because nmake
+ doesn't pass it via MAKEFLAGS.
+
Mon Dec 27 10:33:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/zlib/zlib.c (Init_zlib): Add Zlib.defale and Zlib.inflate.
diff --git a/common.mk b/common.mk
index 19104d011a..96c9959688 100644
--- a/common.mk
+++ b/common.mk
@@ -113,7 +113,7 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--mflags="$(MFLAGS)" \
--make-flags="$(MAKEFLAGS)"
EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
- --make-flags="MINIRUBY='$(MINIRUBY)'" --
+ --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --
INSTRUBY = $(SUDO) $(MINIRUBY) $(srcdir)/tool/rbinstall.rb
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
--data-mode=$(INSTALL_DATA_MODE) \