diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-03 06:22:47 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-03 06:22:47 +0000 |
commit | 8d7a608944357634afc17b7f9463d3006628b5da (patch) | |
tree | fe640b522e2525c2a84e39683882d9f6c8e3bccf | |
parent | 646c318eeb95423ec8724757a096ee5d041f66f7 (diff) | |
download | ruby-8d7a608944357634afc17b7f9463d3006628b5da.tar.gz |
MINIRUBY for cross-compling
* template/configure-ext.mk.tmpl (EXTMK_ARGS): add MINIRUBY for
cross-compling, which is used in extmk.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | common.mk | 6 | ||||
-rw-r--r-- | template/configure-ext.mk.tmpl | 1 |
2 files changed, 5 insertions, 2 deletions
@@ -216,12 +216,14 @@ exts: build-ext EXTS_MK = exts.mk $(EXTS_MK): ext/configure-ext.mk $(TIMESTAMPDIR)/.$(arch).time $(srcdir)/template/exts.mk.tmpl $(Q)$(MAKE) -f ext/configure-ext.mk $(mflags) V=$(V) EXTSTATIC=$(EXTSTATIC) \ - gnumake=$(gnumake) EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)" + gnumake=$(gnumake) MINIRUBY="$(MINIRUBY)" \ + EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)" $(ECHO) generating makefile $@ $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ $(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake) -ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) +ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) \ + $(srcdir)/template/configure-ext.mk.tmpl $(ECHO) generating makefiles $@ $(Q)$(MAKEDIRS) $(@D) $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl index 3f432217eb..2b6690c8b8 100644 --- a/template/configure-ext.mk.tmpl +++ b/template/configure-ext.mk.tmpl @@ -24,6 +24,7 @@ end MINIRUBY = <%=miniruby%> SCRIPT_ARGS = <%=script_args%> EXTMK_ARGS = $(SCRIPT_ARGS) --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ + --make-flags='MINIRUBY=$(MINIRUBY)' all: exts gems exts: |