summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-03 05:53:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-03 05:53:18 +0000
commit91c9a4becb625e10011e82e74d1be22835dda775 (patch)
tree48f5a7924cc9a102711779f8f93de8a97313e185
parent8dba4cdf88afe060be1ae5397dbcb002a0db5080 (diff)
* common.mk (main): passes $(MAKE) to mkmain_cmd
* ext/extmk.rb (command_output): uses arguments to invoke make. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--common.mk2
-rw-r--r--ext/extmk.rb6
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4fab1edf0b..70876bd6c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 3 14:53:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (main): passes $(MAKE) to mkmain_cmd
+
+ * ext/extmk.rb (command_output): uses arguments to invoke make.
+
Tue Mar 3 01:56:03 2009 Tanaka Akira <akr@fsij.org>
* lib/securerandom.rb (SecureRandom.urlsafe_base64): delete padding.
diff --git a/common.mk b/common.mk
index 3391bca878..0c06ee548a 100644
--- a/common.mk
+++ b/common.mk
@@ -125,7 +125,7 @@ COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prel
all: encs exts main
main: exts
- @$(RUNCMD) $(MKMAIN_CMD) MAKE=$(MAKE)
+ @$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
exts: $(MKMAIN_CMD)
diff --git a/ext/extmk.rb b/ext/extmk.rb
index adca9b4030..69002236c5 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -565,13 +565,13 @@ $mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT")
if $command_output
message = "echo #{message}"
- cmd = [$make, *sysquote($makeflags)].join(' ')
+ cmd = sysquote($makeflags).join(' ')
open($command_output, 'wb') do |f|
case $command_output
when /\.sh\z/
- f.puts message, "rm -f $0; exec #{cmd}"
+ f.puts message, "rm -f $0; exec \"$@\" #{cmd}"
when /\.bat\z/
- ["@echo off", message, cmd, "del %0 & exit %ERRORLEVEL%"].each do |s|
+ ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |s|
f.print s, "\r\n"
end
else