[前][次][番号順一覧][スレッド一覧]

ruby-changes:45691

From: nobu <ko1@a...>
Date: Fri, 3 Mar 2017 15:22:51 +0900 (JST)
Subject: [ruby-changes:45691] nobu:r57764 (trunk): MINIRUBY for cross-compling

nobu	2017-03-03 15:22:47 +0900 (Fri, 03 Mar 2017)

  New Revision: 57764

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57764

  Log:
    MINIRUBY for cross-compling
    
    * template/configure-ext.mk.tmpl (EXTMK_ARGS): add MINIRUBY for
      cross-compling, which is used in extmk.rb.

  Modified files:
    trunk/common.mk
    trunk/template/configure-ext.mk.tmpl
Index: template/configure-ext.mk.tmpl
===================================================================
--- template/configure-ext.mk.tmpl	(revision 57763)
+++ template/configure-ext.mk.tmpl	(revision 57764)
@@ -24,6 +24,7 @@ end https://github.com/ruby/ruby/blob/trunk/template/configure-ext.mk.tmpl#L24
 MINIRUBY = <%=miniruby%>
 SCRIPT_ARGS = <%=script_args%>
 EXTMK_ARGS = $(SCRIPT_ARGS) --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
+	   --make-flags='MINIRUBY=$(MINIRUBY)'
 
 all: exts gems
 exts:
Index: common.mk
===================================================================
--- common.mk	(revision 57763)
+++ common.mk	(revision 57764)
@@ -216,12 +216,14 @@ exts: build-ext https://github.com/ruby/ruby/blob/trunk/common.mk#L216
 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 \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]