Skip to content

Commit a975133

Browse files
committed
Link Ruby 4 Clang with GCC 10
Use Devtoolset 10 CRT and libgcc paths when Clang links Ruby 4 extensions, matching the toolchain that built the static Ruby library.
1 parent f6ea306 commit a975133

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/engines/ruby/4.0/Dockerfile.centos.clang

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ghcr.io/datadog/images-rb/engines/ruby:4.0-centos
22

33
RUN yum install -y epel-release \
4-
&& yum install -y gcc clang make binutils file patch pkgconfig mariadb-devel postgresql-devel sqlite-devel \
4+
&& yum install -y devtoolset-10-gcc clang make binutils file patch pkgconfig mariadb-devel postgresql-devel sqlite-devel \
55
&& printf '%s\n' \
66
'#!/bin/bash' \
7-
'gcc_dir="$(dirname "$(/usr/bin/gcc -print-file-name=crtbegin.o)")"' \
7+
'gcc_dir="$(dirname "$(/opt/rh/devtoolset-10/root/usr/bin/gcc -print-file-name=crtbegin.o)")"' \
88
'args=()' \
99
'for arg in "$@"; do' \
1010
' if [[ "$arg" != "-fstack-protector-strong" && "$arg" != "-mbranch-protection=pac-ret" ]]; then' \

0 commit comments

Comments
 (0)