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: showflags only once

Browse source 
* common.mk (showflags): do not show flags from recursive make.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-22 14:56:37 +00:00
parent be8a9db524
commit 29a1905c7d
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common.mk
View file

@ -156,13 +156,15 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb
COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl
all: showflags main docs SHOWFLAGS = showflags
main: showflags $(ENCSTATIC:static=lib)encs exts all: $(SHOWFLAGS) main docs
main: $(SHOWFLAGS) $(ENCSTATIC:static=lib)encs exts
@$(NULLCMD) @$(NULLCMD)
.PHONY: showflags .PHONY: showflags
exts enc trans: showflags exts enc trans: $(SHOWFLAGS)
showflags: showflags:
$(MESSAGE_BEGIN) \ $(MESSAGE_BEGIN) \
" CC = $(CC)" \ " CC = $(CC)" \
@ -219,8 +221,8 @@ Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb
$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \ $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)" --srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
program: showflags $(PROGRAM) program: $(SHOWFLAGS) $(PROGRAM)
wprogram: showflags $(WPROGRAM) wprogram: $(SHOWFLAGS) $(WPROGRAM)
mini: PHONY miniruby$(EXEEXT) mini: PHONY miniruby$(EXEEXT)
$(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
@ -631,7 +633,7 @@ yes-runnable: PHONY
encs: enc trans encs: enc trans
libencs: libenc libtrans libencs: libenc libtrans
encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP) PHONY encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
$(ECHO) making $@ $(ECHO) making $@
$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \ $(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \ RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \

2
defs/gmake.mk
View file

@ -18,7 +18,7 @@ ifeq ($(if $(filter all main exts enc trans libencs libenc libtrans \
wprogram rubyw rubyw$(EXEEXT) \ wprogram rubyw rubyw$(EXEEXT) \
miniruby$(EXEEXT) mini,\ miniruby$(EXEEXT) mini,\
$(MAKECMDGOALS)),,$(MAKECMDGOALS)),) $(MAKECMDGOALS)),,$(MAKECMDGOALS)),)
-include showflags -include $(SHOWFLAGS)
endif endif
ifneq ($(filter universal-%,$(arch)),) ifneq ($(filter universal-%,$(arch)),)

1
ext/extmk.rb
View file

@ -703,6 +703,7 @@ if $configure_only and $command_output
end end
submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"' submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"'
submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"' submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"'
submakeopts << 'SHOWFLAGS='
mf.macro "SUBMAKEOPTS", submakeopts mf.macro "SUBMAKEOPTS", submakeopts
mf.puts mf.puts
targets = %w[all install static install-so install-rb clean distclean realclean] targets = %w[all install static install-so install-rb clean distclean realclean]