kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

common.mk, Makefile.sub: fix build failure on mswin

Browse source 
* 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
This commit is contained in:
nobu 2013-05-15 16:44:55 +00:00
parent 4616913dc5
commit fa827c8b5a
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> Thu May 16 01:25:07 2013 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: only emit warnings when * ext/psych/lib/psych/visitors/yaml_tree.rb: only emit warnings when

2
common.mk
View file

@ -836,7 +836,7 @@ newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH)}defines.h \
verconf.h: verconf.in $(PREP) $(srcdir)/tool/shvar_to_cpp.rb $(RBCONFIG) verconf.h: verconf.in $(PREP) $(srcdir)/tool/shvar_to_cpp.rb $(RBCONFIG)
$(ECHO) creating $@ $(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) \ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
eval.$(OBJEXT) \ eval.$(OBJEXT) \

11
win32/Makefile.sub
View file

@ -699,6 +699,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define EXECUTABLE_EXTS $(EXECUTABLE_EXTS) #define EXECUTABLE_EXTS $(EXECUTABLE_EXTS)
#define RUBY_COREDLL "$(RT)" #define RUBY_COREDLL "$(RT)"
#define LIBRUBY_SO "$(LIBRUBY_SO)" #define LIBRUBY_SO "$(LIBRUBY_SO)"
#define RUBY_PLATFORM "$(arch)"
#define RUBY_SITEARCH "$(sitearch)"
#if 0 #if 0
$(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)" $(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)"
config.h: nul config.h: nul
@ -706,14 +708,13 @@ $(BANG)endif
#endif #endif
#endif /* $(guard) */ #endif /* $(guard) */
<< <<
@echo Creating verconf.h @echo Creating verconf.in
@$(IFCHANGE) verconf.h << @$(IFCHANGE) verconf.in <<
#define RUBY_LIB_VERSION_STYLE 3 /* full */ #define RUBY_LIB_VERSION_STYLE 3 /* full */
#define RUBY_LIB_PREFIX "/lib/$(RUBY_BASE_NAME)" #define RUBY_EXEC_PREFIX ""
#define RUBY_PLATFORM "$(arch)"
#define RUBY_SITEARCH "$(sitearch)"
<< <<
@exit > $(@:/=\) @exit > $(@:/=\)
@if exist verconf.h del verconf.h
#!if exist($(RUBY_CONFIG_H)) #!if exist($(RUBY_CONFIG_H))
#! if exist(config_h.bak) #! if exist(config_h.bak)