diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 08:41:59 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 08:41:59 +0000 |
| commit | 48834d2067a6798b30c028edebec9c203c6ff2f3 (patch) | |
| tree | 4a6d982758db3d5ca2698afa6392e757b755761e | |
| parent | adf8716d9882a5b37469c1bab66409ebd734291e (diff) | |
| download | ruby-48834d2067a6798b30c028edebec9c203c6ff2f3.tar.gz | |
common.mk: MAKE_ENC
* common.mk (MAKE_ENC): arguments for enc.mk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 9 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index e1d9c3dee9..9c8748aa4d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -439,7 +439,7 @@ clean-extout: clean-enc distclean-enc realclean-enc: @test -f "$(ENC_MK)" || exit 0; \ echo $(@:-enc=ing) encodings; \ - exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=) + exec $(MAKE) $(MAKE_ENC) $(@:-enc=) ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(ECHO) compiling $@ @@ -64,6 +64,8 @@ DLDOBJS = $(INITOBJS) EXTSOLIBS = MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT) ENC_MK = enc.mk +MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_VERSION=$(UNICODE_VERSION) \ + RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) COMMONOBJS = array.$(OBJEXT) \ bignum.$(OBJEXT) \ @@ -665,9 +667,7 @@ encs: enc trans libencs: libenc libtrans encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY $(ECHO) making $@ - $(Q) $(MAKE) -f $(ENC_MK) V="$(V)" UNICODE_VERSION=$(UNICODE_VERSION) \ - RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \ - $(MFLAGS) $@ + $(Q) $(MAKE) $(MAKE_ENC) $@ libenc enc: {$(VPATH)}encdb.h @@ -819,8 +819,7 @@ srcs-lib: $(LIB_SRCS) srcs-enc: $(ENC_MK) $(ECHO) making srcs under enc - $(Q) $(MAKE) -f $(ENC_MK) UNICODE_VERSION=$(UNICODE_VERSION) \ - RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs + $(Q) $(MAKE) $(MAKE_ENC) srcs all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 1791adbb18..abe65997df 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1075,7 +1075,7 @@ clean-extout: clean-enc distclean-enc realclean-enc: !if exist($(ENC_MK)) @echo $(@:-enc=ing) encodings - @-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=) + @-$(MAKE) $(MAKE_ENC) $(@:-enc=) !endif $(RBCONFIG): $(PREP) |