diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 05:53:18 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 05:53:18 +0000 |
| commit | 2711fde3db1dabc3bdaab7d499e7a06d386be843 (patch) | |
| tree | 48f5a7924cc9a102711779f8f93de8a97313e185 /ext | |
| parent | dc2685fdf50959f74d27845f978c8f0562c7a426 (diff) | |
| download | ruby-2711fde3db1dabc3bdaab7d499e7a06d386be843.tar.gz ruby-2711fde3db1dabc3bdaab7d499e7a06d386be843.tar.xz ruby-2711fde3db1dabc3bdaab7d499e7a06d386be843.zip | |
* common.mk (main): passes $(MAKE) to mkmain_cmd
* ext/extmk.rb (command_output): uses arguments to invoke make.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index adca9b403..69002236c 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 |