diff options
| author | Nobuyoshi Nakada <[email protected]> | 2024-12-20 16:44:27 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2024-12-22 22:10:26 +0900 |
| commit | 4fb5d746ce02dcaf8702f97f88946c090b65d4a2 () | |
| tree | 90e5b399bf41b46cd7720e905e6f141b89c57750 | |
| parent | 2f2530b195008209e1d9e4e9734509d5f956fa49 (diff) | |
Split `modular-gc` into build and installation
Notes: Merged: https://.com/ruby/ruby/pull/12428
| -rw-r--r-- | ./workflows/modgc.yml | 2 | ||||
| -rw-r--r-- | common.mk | 15 | ||||
| -rw-r--r-- | template/Makefile.in | 4 |
3 files changed, 14 insertions, 7 deletions
@@ -132,7 +132,7 @@ jobs: - name: Build Modular GC run: | echo "RUBY_GC_LIBRARY=${{ matrix.gc.name }}" >> $_ENV - make modular-gc MODULAR_GC=${{ matrix.gc.name }} MMTK_BUILD=${{ matrix.gc.mmtk_build }} make distclean-modular-gc MODULAR_GC=${{ matrix.gc.name }} - run: | @@ -1941,9 +1941,18 @@ rewindable: HELP_EXTRA_TASKS = "" modular-gc-precheck: -modular-gc: probes.h modular-gc-precheck - $(Q) $(MAKEDIRS) $(modular_gc_dir) $(Q) $(RUNRUBY) $(srcdir)/ext/extmk.rb \ $(SCRIPT_ARGS) \ --make='$(MAKE)' --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \ @@ -1951,6 +1960,8 @@ modular-gc: probes.h modular-gc-precheck --ext-build-dir=gc --command-output=gc/$(MODULAR_GC)/exts.mk -- \ configure gc/$(MODULAR_GC) $(CHDIR) gc/$(MODULAR_GC) && $(exec) $(MAKE) TARGET_SO_DIR=./ $(CP) gc/$(MODULAR_GC)/librubygc.$(MODULAR_GC).$(DLEXT) $(modular_gc_dir) clean-modular-gc: gc/clean @@ -353,10 +353,6 @@ modular-gc-precheck: echo "You must configure with --with-modular-gc to use modular GC"; \ exit 1; \ fi - $(Q) if test -z $(MODULAR_GC); then \ - echo "You must specify MODULAR_GC with the GC to build"; \ - exit 1; \ - fi pre-install-local:: pkgconfig-data |