diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-27 12:15:56 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-27 12:20:42 +0300 |
| commit | 3bdcf027fab1505cf0bd97a70c60da1837c10377 (patch) | |
| tree | 582621e07c3a0dd900ff52bd3b16a5e8c422ea67 /Makefile | |
| parent | b1d9d5e05a723c65957fba2db945872ee45a223b (diff) | |
Makefile: Fix building git if PROFILE envvar is set
It was reported that building git fails with a bunch of compile errors
related to profiling. As it turns out, git's Makefile checks whether the
PROFILE environment variable is set and, if so, tries to build git with
profiling information. This is quite unexpected and most likely not what
the user building Gitaly wants, and with such a generic variable name
it's easy enough to accidentally hit.
Unset the environment variable to fix this issue. If a user really wants
to enable it, it should be added to the GIT_BUILD_OPTIONS array.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -453,7 +453,7 @@ ifneq (${GIT_PATCHES},) endif ${Q}rm -rf ${GIT_INSTALL_DIR} ${Q}mkdir -p ${GIT_INSTALL_DIR} - env -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C ${GIT_SOURCE_DIR} -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} install + env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C ${GIT_SOURCE_DIR} -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} install else ${DEPENDENCY_DIR}/git_full_bins.tgz: ${DEPENDENCY_DIR}/git.version curl -o $@.tmp --silent --show-error -L ${GIT_BINARIES_URL} |