diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-15 16:44:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-15 16:44:55 +0000 |
| commit | fa827c8b5a870ac586c18bf711cdaa8dc4028762 (patch) | |
| tree | 3cf899f46e273c475dd7f89843b76ba9290adfab | |
| parent | 4616913dc5a23132bafe60ea36d07bd3b440316f (diff) | |
| download | ruby-fa827c8b5a870ac586c18bf711cdaa8dc4028762.tar.gz | |
common.mk, Makefile.sub: fix build failure on mswin
* common.mk (verconf.h): $< cannot be used in explicit rules with
nmake.
* win32/Makefile.sub (CONFIG_H): create verconf.in instead of
verconf.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 11 |
3 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Thu May 16 01:44:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (verconf.h): $< cannot be used in explicit rules with + nmake. + + * win32/Makefile.sub (CONFIG_H): create verconf.in instead of + verconf.h. + Thu May 16 01:25:07 2013 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/yaml_tree.rb: only emit warnings when @@ -836,7 +836,7 @@ newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH)}defines.h \ verconf.h: verconf.in $(PREP) $(srcdir)/tool/shvar_to_cpp.rb $(RBCONFIG) $(ECHO) creating $@ - $(Q) $(MINIRUBY) "$(srcdir)/tool/shvar_to_cpp.rb" $< > $@ + $(Q) $(MINIRUBY) "$(srcdir)/tool/shvar_to_cpp.rb" verconf.in > $@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \ eval.$(OBJEXT) \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 04e48c4f8f..c27c66c70e 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -699,6 +699,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #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 @@ -706,14 +708,13 @@ $(BANG)endif #endif #endif /* $(guard) */ << - @echo Creating verconf.h - @$(IFCHANGE) verconf.h << + @echo Creating verconf.in + @$(IFCHANGE) verconf.in << #define RUBY_LIB_VERSION_STYLE 3 /* full */ -#define RUBY_LIB_PREFIX "/lib/$(RUBY_BASE_NAME)" -#define RUBY_PLATFORM "$(arch)" -#define RUBY_SITEARCH "$(sitearch)" +#define RUBY_EXEC_PREFIX "" << @exit > $(@:/=\) + @if exist verconf.h del verconf.h #!if exist($(RUBY_CONFIG_H)) #! if exist(config_h.bak) |