nobu	2017-01-23 12:51:25 +0900 (Mon, 23 Jan 2017)

  New Revision: 57403

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

  Log:
    Fix for nmake
    
    * common.mk (EXT_MK): use double-quotes and remove SCRIPT_ARGS
      which contains both types of quotes.
    
    * template/configure-ext.mk.tmpl (all): use single-quotes for MAKE
      which is set by nmake and contains spaces in the path. do not
      use SCRIPT_ARGS.
    
    * template/exts.mk.tmpl (all, static): separate dependency lines,
      not to become a default target unintentionally.

  Modified files:
    trunk/common.mk
    trunk/template/configure-ext.mk.tmpl
    trunk/template/exts.mk.tmpl
Index: template/configure-ext.mk.tmpl
===================================================================
--- template/configure-ext.mk.tmpl	(revision 57402)
+++ template/configure-ext.mk.tmpl	(revision 57403)
@@ -18,8 +18,8 @@ all: https://github.com/ruby/ruby/blob/trunk/template/configure-ext.mk.tmpl#L18
 % exts.each do |dir|
 all: ext/<%=dir%>/exts.mk
 ext/<%=dir%>/exts.mk: FORCE
-	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=ext/<%=dir%>/exts.mk \
-		$(SCRIPT_ARGS) --extension=<%=dir%> --extstatic $(EXTSTATIC) \
+	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make='$(MAKE)' --command-output=ext/<%=dir%>/exts.mk \
+		--extension=<%=dir%> --extstatic $(EXTSTATIC) \
 		--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
 		-- subconfigure
 % end
Index: template/exts.mk.tmpl
===================================================================
--- template/exts.mk.tmpl	(revision 57402)
+++ template/exts.mk.tmpl	(revision 57403)
@@ -71,7 +71,8 @@ SUBMAKEOPTS = DLDOBJS="$(EXTOBJS) $(EXTE https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L71
 	      EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \
 	      UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS=
 
-all static: ruby
+all: ruby
+static: ruby
 
 clean:
 	-$(Q)$(RM) ext/extinit.<%= objext %>
Index: common.mk
===================================================================
--- common.mk	(revision 57402)
+++ common.mk	(revision 57403)
@@ -211,8 +211,8 @@ exts: build-ext https://github.com/ruby/ruby/blob/trunk/common.mk#L211
 
 EXTS_MK = exts.mk
 $(EXTS_MK): ext/configure-ext.mk $(TIMESTAMPDIR)/.$(arch).time $(srcdir)/template/exts.mk.tmpl
-	$(MAKE) -f ext/configure-ext.mk V=$(V) MINIRUBY='$(MINIRUBY)' \
-		SCRIPT_ARGS='$(SCRIPT_ARGS)' EXTSTATIC=$(EXTSTATIC) \
+	$(MAKE) -f ext/configure-ext.mk V=$(V) MINIRUBY="$(MINIRUBY)" \
+		EXTSTATIC=$(EXTSTATIC) \
 		gnumake=$(gnumake) EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)"
 	$(ECHO) generating makefile $@
 	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \

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