diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-26 08:01:37 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-26 08:01:37 +0000 |
| commit | d0035dbdf83a48bd96fc1e0646b4ae01d3a2f135 (patch) | |
| tree | 2385d1fdf3c3d343dd2433e84a280796ad0ac4ff /win32 | |
| parent | b65b41861f590ae14ec932e323337923ce12ca18 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a11a3472bc..d5f3912359 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -510,8 +510,15 @@ config.status: $(CONFIG_H) 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/Makefile.sub $(win_srcdir)/Makefile.sub !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) */ << |