summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorJun Aruga <jaruga@redhat.com>2022-05-24 16:00:53 +0200
committerJun Aruga <junaruga@users.noreply.github.com>2022-06-07 00:25:19 +0200
commitcfcf33f1270f78c5fb928d7a0927e6be02ec8900 (patch)
tree0e05076bf80a734e69c30ce6c50b85e21f79cd97 /.github/workflows
parentec3542229b29ec93062e9d90e877ea29d3c19472 (diff)
.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@gmail.com> Fixes [Bug #18781]
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/5938
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/compilers.yml10
1 files 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:
- 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:
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