diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-28 05:23:39 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-28 05:23:39 +0000 |
commit | c3df88eca65bcfe86b4edaff4128b1425ad909de (patch) | |
tree | 42b1e2a8e6aca141b47b34764417f0ace352e7d4 /ext/extmk.rb | |
parent | cc33dd2b675f4ce8e9dd96498d4da9b1725cd2b7 (diff) |
extmk.rb: remove direct build mode
* ext/extmk.rb (parse_args): --command-output is now mandatory.
remove direct build mode.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb')
-rwxr-xr-x | ext/extmk.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index bf6b9d9d8e..c61e24febc 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -375,6 +375,7 @@ def parse_args() $optparser.warn(e) abort $optparser.to_s end + $command_output or abort "--command-output option is mandatory" $destdir ||= '' @@ -681,7 +682,7 @@ $makeflags.uniq! $mflags.unshift("topdir=#$topdir") ENV.delete("RUBYOPT") -if $configure_only and $command_output +if $configure_only exts.map! {|d| "#{ext_prefix}/#{d}/."} FileUtils.makedirs(File.dirname($command_output)) atomic_write_open($command_output) do |mf| @@ -781,7 +782,7 @@ if $configure_only and $command_output end end -elsif $command_output +else message = "making #{rubies.join(', ')}" message = "echo #{message}" $mflags.concat(rubies) @@ -800,12 +801,6 @@ elsif $command_output end ff.chmod(0755) end -elsif !$configure_only - message = "making #{rubies.join(', ')}" - puts message - $stdout.flush - $mflags.concat(rubies) - system($make, *$mflags) or exit($?.exitstatus) end # :startdoc: |