Skip to content

M
mruby
Unverified Commit ed0a5f9e authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub
Browse files
Options

Merge pull request #4440 from kou/cc-with-option 

Add support for CC="gcc --option ..." again
parents b6e9fab6 d5c88683
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
lib/mruby/build/command.rb
View file @ ed0a5f9e
...@@ -30,10 +30,13 @@ module MRuby ...@@ -30,10 +30,13 @@ module MRuby
def _run(options, params={}) def _run(options, params={})
return sh command + ' ' + ( options % params ) if NotFoundCommands.key? @command return sh command + ' ' + ( options % params ) if NotFoundCommands.key? @command
begin begin
fiber, $rake_root_fiber = $rake_root_fiber, nil
sh build.filename(command) + ' ' + ( options % params ) sh build.filename(command) + ' ' + ( options % params )
rescue RuntimeError rescue RuntimeError
NotFoundCommands[@command] = true NotFoundCommands[@command] = true
_run options, params _run options, params
ensure
$rake_root_fiber = fiber
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment