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

From cfcf33f1270f78c5fb928d7a0927e6be02ec8900 Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@r...>
Date: Tue, 24 May 2022 16:00:53 +0200
Subject: .github/workflows/compilers.yml: annocheck: Fix a linker flag to pass
 MJIT tests.

Set the linker flag `-Wl,-z,now` properly.

Co-authored-by: Takashi Kokubun <takashikkbn@g...>

Fixes [Bug #18781]
---
 .github/workflows/compilers.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 261431dfb5..d2e4c00613 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -80,9 +80,10 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L80
           - key: default_cc
             name: 'gcc-11 annocheck'
             # Minimal flags to pass the check.
-            value: 'gcc-11 -O2 -fcf-protection -Wl,-z,now'
+            value: 'gcc-11 -O2 -fcf-protection'
             container: gcc-11
             env:
+              append_configure: 'LDFLAGS=-Wl,-z,now'
               # FIXME: Drop skipping options
               # https://bugs.ruby-lang.org/issues/18061
               # https://sourceware.org/annobin/annobin.html/Test-pie.html
@@ -247,13 +248,6 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L248
         if: ${{ matrix.entry.check }}
       - run: make test-tool
         if: ${{ matrix.entry.check }}
-      # FIXME: Skip MJIT tests failing in the annocheck case.
-      # https://bugs.ruby-lang.org/issues/18781
-      - run: |
-          rm test/ruby/test_mjit.rb
-          rm test/ruby/test_rubyvm_mjit.rb
-        if: ${{ endsWith(matrix.entry.name, 'annocheck') }}
-        working-directory: src
       - run: make test-all TESTS='-- ruby -ext-'
         if: ${{ matrix.entry.check }}
       - run: make test-spec
-- 
cgit v1.2.1


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