diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-09-30 00:19:16 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-09-30 00:19:16 +0900 |
| commit | 5139a574aa00e034bfb1dbdc9d97aca207916817 (patch) | |
| tree | cb81c78f1aa0ce64feebdf744521ab7d6eb1e0fe | |
| parent | 9d60480094b076e2697248238787b589e3f69ab7 (diff) | |
Make directory for shared-GC libraries at build
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/11726
| -rw-r--r-- | .github/workflows/ubuntu.yml | 6 | ||||
| -rw-r--r-- | common.mk | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 24465628fb..e829596165 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -35,7 +35,6 @@ jobs: configure: '--enable-shared --enable-load-relative' - test_task: check shared_gc: true - shared_gc_dir: '/home/runner/ruby_gc' configure: '--with-shared-gc=/home/runner/ruby_gc' - test_task: test-bundler-parallel timeout: 50 @@ -99,9 +98,8 @@ jobs: if: ${{ matrix.test_task == 'test-bundled-gems' }} - name: Build shared GC - run: > - echo "RUBY_GC_LIBRARY=librubygc.default.so" >> $GITHUB_ENV && - mkdir ${{ matrix.shared_gc_dir }} && + run: | + echo "RUBY_GC_LIBRARY=librubygc.default.so" >> $GITHUB_ENV make shared-gc SHARED_GC=default if: ${{ matrix.shared_gc }} @@ -1914,8 +1914,9 @@ shared-gc: probes.h exit 1; \ else \ echo generating $(shared_gc_dir)librubygc.$(SHARED_GC).$(SOEXT); \ - $(LDSHARED) -I$(srcdir)/include -I$(srcdir) -I$(arch_hdrdir) $(XDLDFLAGS) $(cflags) -DBUILDING_SHARED_GC -fPIC -o $(shared_gc_dir)librubygc.$(SHARED_GC).$(SOEXT) $(srcdir)/gc/$(SHARED_GC).c; \ fi + $(Q) $(MAKEDIRS) $(shared_gc_dir) + $(Q) $(LDSHARED) -I$(srcdir)/include -I$(srcdir) -I$(arch_hdrdir) $(XDLDFLAGS) $(cflags) -DBUILDING_SHARED_GC -fPIC -o $(shared_gc_dir)librubygc.$(SHARED_GC).$(SOEXT) $(srcdir)/gc/$(SHARED_GC).c help: PHONY $(MESSAGE_BEGIN) \ |