diff options
| author | Toon Claes <toon@gitlab.com> | 2022-04-28 18:49:39 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-04-28 18:49:39 +0300 |
| commit | fce0a7487ccf90a866bf6a2428b23b428cd67c5c (patch) | |
| tree | b8afc14f9d1f67202c506274875ea9581b911b1a | |
| parent | 3676a06b0671b843153e6c123231396ae6b9b546 (diff) | |
| parent | e126a82921b3ae9fc5f25a20c99dcbbee09240ea (diff) | |
Merge branch 'pks-makefile-git-improvements' into 'master'
Makefile: Small improvements to how Git is built
See merge request gitlab-org/gitaly!4506
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -157,7 +157,6 @@ ifeq ($(origin GIT_BUILD_OPTIONS),undefined) GIT_BUILD_OPTIONS += NO_TCLTK=YesPlease GIT_BUILD_OPTIONS += NO_GETTEXT=YesPlease GIT_BUILD_OPTIONS += NO_PYTHON=YesPlease - GIT_BUILD_OPTIONS += NO_INSTALL_HARDLINKS=YesPlease PCRE_PC=libpcre2-8 ifeq ($(shell pkg-config --exists ${PCRE_PC} && echo exists),exists) GIT_BUILD_OPTIONS += LIBPCREDIR=$(shell pkg-config ${PCRE_PC} --variable prefix) @@ -557,7 +556,8 @@ $(patsubst %,${DEPENDENCY_DIR}/git-\%/%,${GIT_EXECUTABLES}): ${DEPENDENCY_DIR}/g ${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "${@D}" -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} ${GIT_EXECUTABLES} ${Q}touch $@ -${GIT_PREFIX}/bin/git: ${DEPENDENCY_DIR}/git-${GIT_VERSION}.${GIT_EXTRA_VERSION}/Makefile +# This target builds a full Git distribution and installs it into GIT_PREFIX. +${GIT_PREFIX}/bin/git: ${DEPENDENCY_DIR}/git-distribution/Makefile @ # Remove the Git installation first in case GIT_PREFIX is the default @ # prefix which always points into our build directory. This is done so @ # we never end up with mixed Git installations on developer machines. |