diff options
| author | Toon Claes <toon@gitlab.com> | 2021-04-29 13:10:39 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-04-29 13:10:39 +0300 |
| commit | 597a9a9764efadb005d93550429b0f8827b748ec (patch) | |
| tree | 39de9a72a9039426ca7856647884c0b875d925a1 | |
| parent | 22654ba48106412ca6680366afe6a47389458720 (diff) | |
| parent | 3bdcf027fab1505cf0bd97a70c60da1837c10377 (diff) | |
Merge branch 'pks-makefile-git-profile' into 'master'
Makefile: Unset PROFILE envvar before building git
See merge request gitlab-org/gitaly!3414
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/pks-makefile-git-profile.yml | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -420,7 +420,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} diff --git a/changelogs/unreleased/pks-makefile-git-profile.yml b/changelogs/unreleased/pks-makefile-git-profile.yml new file mode 100644 index 000000000..a113117bc --- /dev/null +++ b/changelogs/unreleased/pks-makefile-git-profile.yml @@ -0,0 +1,5 @@ +--- +title: 'Makefile: Unset PROFILE envvar before building git' +merge_request: 3414 +author: +type: fixed |