diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-18 21:27:33 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-18 21:27:33 +0900 |
| commit | b4f8f4ce85c8adcba11931422b065aac6f06f50b (patch) | |
| tree | 8323efd494aacccdf24524b6053b39b8e025e541 /common.mk | |
| parent | 9fc7df7504f41a7f370e62a004c3fc0abc439295 (diff) | |
merge revision(s) 77f3f8a1d4f45d06df6cfea2bac3a67867c19efb:
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(-)
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -303,7 +303,7 @@ configure-ext: $(EXTS_MK) 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) |