summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mk6
-rw-r--r--template/configure-ext.mk.tmpl1
2 files changed, 5 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index f42bd4b687..d76e4b054d 100644
--- a/common.mk
+++ b/common.mk
@@ -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: