Skip to content
Snippets Groups Projects
Commit 41bc15da authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch '7672-fix-ruby-magic-builds' into 'master'

Force C99 on CentOS 7 and SLES when building gitlab-rails

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



Merged-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Approved-by: default avatarJason Plum <jplum@gitlab.com>
Approved-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Reviewed-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarBalasankar "Balu" C <balasankar@gitlab.com>
parents 6bf56c9e 6c672e24
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!92Merging upstream 15.10.0+ce.0
......@@ -92,6 +92,8 @@
env['PKG_CONFIG_PATH'] = "#{OpenSSLHelper.pkg_config_dirs}:/opt/gitlab/embedded/lib/pkgconfig"
end
env['CFLAGS'] = '-std=gnu99' if OhaiHelper.get_centos_version.to_i == 7 || OhaiHelper.os_platform == 'sles'
bundle "config set --local gemfile #{gitlab_bundle_gemfile}" if gitlab_bundle_gemfile != 'Gemfile'
bundle 'config force_ruby_platform true', env: env if OhaiHelper.ruby_native_gems_unsupported?
bundle 'config build.gpgme --use-system-libraries', env: env
......
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