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
This commit is contained in:
parent
83f76f46c7
commit
3a520acec3
@ -216,12 +216,14 @@ exts: build-ext
|
|||||||
EXTS_MK = exts.mk
|
EXTS_MK = exts.mk
|
||||||
$(EXTS_MK): ext/configure-ext.mk $(TIMESTAMPDIR)/.$(arch).time $(srcdir)/template/exts.mk.tmpl
|
$(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) \
|
$(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 $@
|
$(ECHO) generating makefile $@
|
||||||
$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
|
$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
|
||||||
$(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake)
|
$(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 $@
|
$(ECHO) generating makefiles $@
|
||||||
$(Q)$(MAKEDIRS) $(@D)
|
$(Q)$(MAKEDIRS) $(@D)
|
||||||
$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
|
$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
|
||||||
|
@ -24,6 +24,7 @@ end
|
|||||||
MINIRUBY = <%=miniruby%>
|
MINIRUBY = <%=miniruby%>
|
||||||
SCRIPT_ARGS = <%=script_args%>
|
SCRIPT_ARGS = <%=script_args%>
|
||||||
EXTMK_ARGS = $(SCRIPT_ARGS) --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
|
EXTMK_ARGS = $(SCRIPT_ARGS) --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
|
||||||
|
--make-flags='MINIRUBY=$(MINIRUBY)'
|
||||||
|
|
||||||
all: exts gems
|
all: exts gems
|
||||||
exts:
|
exts:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user