Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2020-09-02 10:13:00 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2020-09-08 09:01:16 +0300
commit008f200778e526c526c30254b39b5f2c9bd68ff6 (patch)
treeb4d5cdf31fc9aa505d667f28fd96fb76907d1a5c
parent5896f300e150fd11ff3a42b2869d2b8b2204d4fa (diff)
Makefile: Remove duplicate build directory dependencies
Both gocover-cobertura and git targets depend on both the Makefile hash and the build dir. But as the Makefile hash already has a dependency on the build dir, this is duplicate, so we can just remove it.
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ce23b53a5..f07114e0c 100644
--- a/Makefile
+++ b/Makefile
@@ -399,7 +399,7 @@ ${GOIMPORTS}: ${BUILD_DIR}/Makefile.sha256 ${BUILD_DIR}/go.mod
${Q}cd ${BUILD_DIR} && go get golang.org/x/tools/cmd/goimports@2538eef75904eff384a2551359968e40c207d9d2
ifeq (${GIT_USE_PREBUILT_BINARIES},)
-${GIT_INSTALL_DIR}/bin/git: ${BUILD_DIR}/Makefile.sha256 | ${BUILD_DIR}
+${GIT_INSTALL_DIR}/bin/git: ${BUILD_DIR}/Makefile.sha256
${Q}rm -rf ${GIT_SOURCE_DIR} ${GIT_INSTALL_DIR}
${GIT} clone --depth 1 --branch ${GIT_VERSION} --quiet ${GIT_REPO_URL} ${GIT_SOURCE_DIR}
${Q}rm -rf ${GIT_INSTALL_DIR}
@@ -412,7 +412,7 @@ ${GIT_INSTALL_DIR}/bin/git: ${BUILD_DIR}/git_full_bins.tgz
tar -C ${GIT_INSTALL_DIR} -xvzf ${BUILD_DIR}/git_full_bins.tgz
endif
-${GOCOVER_COBERTURA}: ${BUILD_DIR}/Makefile.sha256 | ${BUILD_DIR}
+${GOCOVER_COBERTURA}: ${BUILD_DIR}/Makefile.sha256
${Q}cd ${BUILD_DIR} && go get github.com/t-yuki/gocover-cobertura@${GOCOVER_COBERTURA_VERSION}
${GO_JUNIT_REPORT}: ${BUILD_DIR}/Makefile.sha256 ${BUILD_DIR}/go.mod