nobu	2016-12-26 17:01:37 +0900 (Mon, 26 Dec 2016)

  New Revision: 57188

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

  Log:
    Makefile.sub: refine configuration check
    
    * win32/Makefile.sub (config.status): check configured target by
      reading from config.status, and remove version dependent values
      from config.h.

  Modified files:
    trunk/win32/Makefile.sub
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 57187)
+++ win32/Makefile.sub	(revision 57188)
@@ -510,8 +510,15 @@ config.status: $(CONFIG_H) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L510
 
 BANG = !
 
-!if exist($(RUBY_CONFIG_H))
-!include $(RUBY_CONFIG_H)
+!if !exist(config.status)
+!else if [for /f "skip=1 delims=, tokens=2-3" %I in (config.status) do @ \
+    if "%I" == "@RUBY_SO_NAME@" ( \
+	if not "%J" == "$(RUBY_SO_NAME)" exit 1 \
+    ) else if "%I" == "@target_alias@" ( \
+	if not "%J" == "$(ARCH)-$(PLATFORM)" exit 1 \
+    ) \
+]
+config.status: nul
 !endif
 
 guard = INCLUDE_RUBY_CONFIG_H
@@ -778,14 +785,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L785
 !endif
 #define EXECUTABLE_EXTS $(EXECUTABLE_EXTS)
 #define RUBY_COREDLL "$(RT)"
-#define LIBRUBY_SO "$(LIBRUBY_SO)"
 #define RUBY_PLATFORM "$(arch)"
 #define RUBY_SITEARCH "$(sitearch)"
-#if 0
-$(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)"
-config.h: nul
-$(BANG)endif
-#endif
 #endif /* $(guard) */
 <<
 

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