summaryrefslogtreecommitdiff
path: root/tool/update-deps
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-09 06:55:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-09 06:55:54 +0000
commit141d794f00981e2dbceba7773a18e823576f818f (patch)
tree049cbf044f13beead132d38b4c8744d1cf6c9930 /tool/update-deps
parente9cb552ec960d96f9f7b481d67b84b56fd1c4f5f (diff)
update-deps: strip -j option
* update-deps: strip -j option from ENV['GNUMAKEFLAGS'], not dirstack to get confused by intermingled entering/leaveing directory messages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/update-deps')
-rwxr-xr-xtool/update-deps4
1 files changed, 4 insertions, 0 deletions
diff --git a/tool/update-deps b/tool/update-deps
index c308f35195..ccfc160e42 100755
--- a/tool/update-deps
+++ b/tool/update-deps
@@ -238,6 +238,10 @@ DEPENDENCIES_SECTION_END_MARK = "\# AUTOGENERATED DEPENDENCIES END\n"
def init_global
ENV['LC_ALL'] = 'C'
+ if mkflag = ENV['GNUMAKEFLAGS'] and mkflag.sub!(/(\A|\s+)-j\d*(?=\s+|\z)/, '')
+ mkflag.strip!
+ ENV['GNUMAKEFLAGS'] = mkflag
+ end
$opt_fix = false
$opt_a = false