Skip to content
Snippets Groups Projects
Commit e42f36caa22c authored by James Liu's avatar James Liu
Browse files

gitaly: Remove extra quoting around CFLAGS

Fixes an issue introduced with d92702c70
(gitaly: Add Git build opts to Gitaly definition, 2024-07-15) which
copied over the Git CFLAGS configuration but added unnecessary quoting
around the entire set of flags.

This caused a malformed CFLAGS value and resulted in failing Omnibus
downstream pipelines in the Gitaly change
(https://gitlab.com/gitlab-org/gitaly/-/merge_requests/7035) that makes
use of the embedded Git builds.

See https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/-/jobs/7389766859#L2377
for an example of a failing build in CentOS 7, which relies on us
providing the -std=gnu99 option.
parent 16c92ac234a1
No related branches found
No related tags found
2 merge requests!153heptapod#1722: making 17.3 the new stable,!151Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -71,7 +71,7 @@
env['NEEDS_LIBICONV'] = 'YesPlease'
env['NO_R_TO_GCC_LINKER'] = 'YesPlease'
env['INSTALL_SYMLINKS'] = 'YesPlease'
env['CFLAGS'] = "\"#{git_cflags}\""
env['CFLAGS'] = git_cflags
if Build::Check.use_system_ssl?
env['CMAKE_FLAGS'] = OpenSSLHelper.cmake_flags
......
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