[前][次][番号順一覧][スレッド一覧]

ruby-changes:49599

From: nobu <ko1@a...>
Date: Tue, 9 Jan 2018 15:55:58 +0900 (JST)
Subject: [ruby-changes:49599] nobu:r61714 (trunk): update-deps: strip -j option

nobu	2018-01-09 15:55:54 +0900 (Tue, 09 Jan 2018)

  New Revision: 61714

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61714

  Log:
    update-deps: strip -j option
    
    * update-deps: strip -j option from ENV['GNUMAKEFLAGS'], not
      dirstack to get confused by intermingled entering/leaveing
      directory messages.

  Modified files:
    trunk/tool/update-deps
Index: tool/update-deps
===================================================================
--- tool/update-deps	(revision 61713)
+++ tool/update-deps	(revision 61714)
@@ -238,6 +238,10 @@ DEPENDENCIES_SECTION_END_MARK = "\# AUTO https://github.com/ruby/ruby/blob/trunk/tool/update-deps#L238
 
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]