Skip to content
Snippets Groups Projects
Commit a2d50dad3c58 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'sh-drop-centos-7' into 'master'

Drop CentOS 7 changes for Ruby building

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/8114



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
1 merge request!171Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -90,9 +90,9 @@
# Workaround for https://bugs.ruby-lang.org/issues/19161
env['CFLAGS'] << ' -std=gnu99' if OhaiHelper.os_platform == 'sles'
# We need to recompile native gems on SLES 12 and CentOS 7 because
# precompiled gems such as nokogiri now require glibc >= 2.29,
# and these operating systems use older versions.
# We need to recompile native gems on SLES 12 because precompiled gems
# such as nokogiri now require glibc >= 2.29, and SLES 12 uses an older
# version.
#
# By default, Ruby C extensions use `RbConfig::MAKEFILE_CONFIG["CC"]`,
# which is the C compiler used to build Ruby. Some C extensions can use
......@@ -102,10 +102,7 @@
# support. For now, compiling the Ruby interpreter with GCC 8 works and
# avoids the need to specify the compiler for every extension that needs
# it.
if OhaiHelper.centos7?
env['CC'] = "/opt/rh/devtoolset-8/root/usr/bin/gcc"
env['CXX'] = "/opt/rh/devtoolset-8/root/usr/bin/g++"
elsif OhaiHelper.sles12?
if OhaiHelper.sles12?
env['CC'] = "/usr/bin/gcc-8"
env['CXX'] = "/usr/bin/g++-8"
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment