1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exts.mk.tmpl: propagate MINIRUBY to enc.mk even though invoking from exts.mk

Browse Source 
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
This commit is contained in:
Yuta Saito 2022-03-07 05:44:57 +00:00
parent b068a53dc9
commit 77f3f8a1d4
Notes: git 2022-03-09 22:43:35 +09:00 
Merged: https://github.com/ruby/ruby/pull/5627
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@ -305,7 +305,7 @@ configure-ext: $(EXTS_MK)
build-ext: $(EXTS_MK) build-ext: $(EXTS_MK)
$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ $(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) $(Q)$(MAKE) $(EXTS_NOTE)
exts-note: $(EXTS_MK) exts-note: $(EXTS_MK)

2
template/exts.mk.tmpl
View File

@ -133,7 +133,7 @@ distclean:
% end % end
libencs: libencs:
$(Q)$(MAKE)<%=mflags%> -f enc.mk V=$(V) $@ $(Q)$(MAKE)<%=mflags%> -f enc.mk V=$(V) MINIRUBY="$(MINIRUBY)" $@
ext/extinit.<%=objext%>: ext/extinit.<%=objext%>:
$(Q)$(MAKE)<%=mflags%> V=$(V) EXTINITS="$(EXTINITS)" $@ $(Q)$(MAKE)<%=mflags%> V=$(V) EXTINITS="$(EXTINITS)" $@