diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-16 14:37:04 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-17 13:09:09 +0300 |
| commit | 4208a416d8862e5b92dab2fe56de9ff32cc64605 (patch) | |
| tree | 2aa87daabebb905996cbf1d29c5c0217a667400e | |
| parent | 7512b83b6ac4b93f7d40961a36ff966d4e15c9e9 (diff) | |
Makefile: Fix protoc-gen-gitaly depending on go.mod
The protoc-gen-gitaly target currently depends on `_build/go.mod`, which
is used for building external commands. But given that this executable
only builds from internal sources, this is wrong.
Fix the issue by having it depend on the build directory instead.
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -426,8 +426,8 @@ endif ${GITALYFMT}: | ${BUILD_DIR}/bin ${Q}go build -o $@ ${SOURCE_DIR}/internal/cmd/gitalyfmt -${PROTOC_GEN_GITALY}: ${BUILD_DIR}/go.mod - ${Q}go build -o $@ gitlab.com/gitlab-org/gitaly/proto/go/internal/cmd/protoc-gen-gitaly +${PROTOC_GEN_GITALY}: | ${BUILD_DIR}/bin + ${Q}go build -o $@ ${SOURCE_DIR}/proto/go/internal/cmd/protoc-gen-gitaly ${GOCOVER_COBERTURA}: ${BUILD_DIR}/Makefile.sha256 ${Q}cd ${BUILD_DIR} && go get github.com/t-yuki/gocover-cobertura@${GOCOVER_COBERTURA_VERSION} |