mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Makefile.in: continue if Makefile unchanged
* Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile unchanged. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b7b183f682
commit
1a920c7f9b
3 changed files with 10 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Jan 10 17:45:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile
|
||||
unchanged.
|
||||
|
||||
Thu Jan 10 16:31:20 2013 Shugo Maeda <shugo@ruby-lang.org>
|
||||
|
||||
* vm_insnhelper.c (vm_search_super_method): raise a TypeError
|
||||
|
|
|
@ -251,8 +251,10 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
|
|||
Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
|
||||
|
||||
$(MKFILES): config.status
|
||||
@[ -f Makefile ] && mv Makefile Makefile.old
|
||||
MAKE=$(MAKE) $(SHELL) ./config.status
|
||||
@{ \
|
||||
@cmp Makefile Makefile.old > /dev/null 2>&1 && echo Makefile unchanged && exit 0; \
|
||||
{ \
|
||||
echo "all:; -@rm -f conftest.mk"; \
|
||||
echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
|
||||
echo ".force:"; \
|
||||
|
|
|
@ -448,8 +448,8 @@ test-rubyspec-precheck:
|
|||
|
||||
$(MKFILES): $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/common.mk $(srcdir)/enc/Makefile.in
|
||||
$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
|
||||
@echo $(MKFILES) should be updated, re-run $(MAKE).
|
||||
@exit 1
|
||||
@fc Makefile Makefile.old > nul && echo Makefile unchanged || \
|
||||
(echo $(MKFILES) was updated, re-run $(MAKE). & exit 1)
|
||||
|
||||
RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h
|
||||
CONFIG_H = ./.config.h.time
|
||||
|
|
Loading…
Reference in a new issue