nobu	2015-09-04 12:54:23 +0900 (Fri, 04 Sep 2015)

  New Revision: 51756

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

  Log:
    mkmf.rb: move r40537
    
    * lib/mkmf.rb (create_makefile): move r40537 from extmk.rb.

  Modified files:
    trunk/ext/extmk.rb
    trunk/lib/mkmf.rb
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 51755)
+++ lib/mkmf.rb	(revision 51756)
@@ -2296,7 +2296,7 @@ CLEANLIBS     = #{n}.#{CONFIG['DLEXT']} https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2296
 CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak
 
 all:    #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
-static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
+static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : ""}"}
 .PHONY: all install static install-so install-rb
 .PHONY: clean clean-so clean-static clean-rb
 "
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 51755)
+++ ext/extmk.rb	(revision 51756)
@@ -244,14 +244,7 @@ def extmake(target) https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L244
     end
     ok &&= File.open(makefile){|f| s = f.gets and !s[DUMMY_SIGNATURE]}
     ok = yield(ok) if block_given?
-    if ok
-      open(makefile, "r+b") do |f|
-        s = f.read.sub!(/^(static:)\s(?!all\b).*/, '\1 all') or break
-        f.rewind
-        f.print(s)
-        f.truncate(f.pos)
-      end unless $static
-    else
+    unless ok
       atomic_write_open(makefile) do |f|
         f.puts "# " + DUMMY_SIGNATURE
 	f.print(*dummy_makefile(CONFIG["srcdir"]))

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