diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-14 10:46:18 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-20 09:36:44 +0300 |
| commit | b5c262145ff16802504f081fc23c12b6f193ba1f (patch) | |
| tree | c8555b62812726460760f68014768b266e8ba6dc | |
| parent | e550a87771bf672fd38e296d9533ed6d17a9e714 (diff) | |
Makefile: Rebuild libgit2 and git in case build options change
While we're already rebuilding both libgit2 and git if their respective
versions change, we do not do so in case their build options do. Fix
this by putting build options into their `*.version` files.
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -415,9 +415,9 @@ ${DEPENDENCY_DIR}: | ${BUILD_DIR} # these targets. .PHONY: dependency-version ${DEPENDENCY_DIR}/libgit2.version: dependency-version | ${DEPENDENCY_DIR} - ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${LIBGIT2_VERSION}" ] || >$@ echo -n "${LIBGIT2_VERSION}" + ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${LIBGIT2_VERSION} ${LIBGIT2_BUILD_OPTIONS}" ] || >$@ echo -n "${LIBGIT2_VERSION} ${LIBGIT2_BUILD_OPTIONS}" ${DEPENDENCY_DIR}/git.version: dependency-version | ${DEPENDENCY_DIR} - ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${GIT_VERSION}" ] || >$@ echo -n "${GIT_VERSION}" + ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${GIT_VERSION} ${GIT_BUILD_OPTIONS}" ] || >$@ echo -n "${GIT_VERSION} ${GIT_BUILD_OPTIONS}" ${TOOLS_DIR}/%.version: dependency-version | ${TOOLS_DIR} ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${TOOL_VERSION}" ] || >$@ echo -n "${TOOL_VERSION}" |