summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 21:39:14 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 21:39:14 +0000
commitf22e2d16dabff6ce17c7c2fbfbe7a5e737132a58 (patch)
treef32a893a42449c4d3084264cb0d4809916ff4e8e /tool
parent2725eed1dcccb466d4c4eb3dd9acc46f4214df4c (diff)
merge revision(s) 51812:
* tool/extlibs.rb (do_patch): let "patch" command change the working directory and open the patch file there, instead of spawn options, so that proper error message will be shown by the command not just "chdir" or "open". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/extlibs.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/extlibs.rb b/tool/extlibs.rb
index 09db055983..6323d8fdcd 100755
--- a/tool/extlibs.rb
+++ b/tool/extlibs.rb
@@ -70,7 +70,7 @@ def do_patch(dest, patch, args)
$stdout.puts "applying #{patch} under #{dest}"
$stdout.flush
end
- Process.wait(Process.spawn("patch", *args, in: File.join(dest, patch), chdir: dest))
+ Process.wait(Process.spawn("patch", "-d", dest, "-i", patch, *args))
$?.success? or raise "failed to patch #{patch}"
end