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

ruby-changes:71349

From: Yuta <ko1@a...>
Date: Wed, 9 Mar 2022 22:43:30 +0900 (JST)
Subject: [ruby-changes:71349] 77f3f8a1d4 (master): exts.mk.tmpl: propagate MINIRUBY to enc.mk even though invoking from exts.mk

https://git.ruby-lang.org/ruby.git/commit/?id=77f3f8a1d4

From 77f3f8a1d4f45d06df6cfea2bac3a67867c19efb Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@g...>
Date: Mon, 7 Mar 2022 05:44:57 +0000
Subject: exts.mk.tmpl: propagate MINIRUBY to enc.mk even though invoking from
 exts.mk

This is another attempt to fix out-of-src build with
--with-static-linked-ext. The first attempt was
4f1888bda70981d9f5b1bf55ab692e0ce18e79f4 but reverted because it broke
out-of-src build from pre-generated sources via `make dist`.
This patch fixes the second trans C source gen, mentioned in the
previous commit message, by passing MINIRUBY as well as when invoking
from common.mk
---
 common.mk             | 2 +-
 template/exts.mk.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index 96599d5aff..96ecd4b129 100644
--- a/common.mk
+++ b/common.mk
@@ -305,7 +305,7 @@ configure-ext: $(EXTS_MK) https://github.com/ruby/ruby/blob/trunk/common.mk#L305
 
 build-ext: $(EXTS_MK)
 	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
-	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+	    EXTENCS="$(ENCOBJS)" MINIRUBY="$(MINIRUBY)" UPDATE_LIBRARIES=no $(EXTSTATIC)
 	$(Q)$(MAKE) $(EXTS_NOTE)
 
 exts-note: $(EXTS_MK)
diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl
index 924abeb2fb..2f37f4480a 100644
--- a/template/exts.mk.tmpl
+++ b/template/exts.mk.tmpl
@@ -133,7 +133,7 @@ distclean: https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L133
 % end
 
 libencs:
-	$(Q)$(MAKE)<%=mflags%> -f enc.mk V=$(V) $@
+	$(Q)$(MAKE)<%=mflags%> -f enc.mk V=$(V) MINIRUBY="$(MINIRUBY)" $@
 ext/extinit.<%=objext%>:
 	$(Q)$(MAKE)<%=mflags%> V=$(V) EXTINITS="$(EXTINITS)" $@
 
-- 
cgit v1.2.1


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

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