diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-16 15:34:27 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-17 13:09:09 +0300 |
| commit | dbcb82abebc93924820ad2b4f29fd42040267e3b (patch) | |
| tree | 91cd6bb399a6151974331f37e20ce4ce41c17717 | |
| parent | 4208a416d8862e5b92dab2fe56de9ff32cc64605 (diff) | |
Makefile: Move protoc target to other binary targets
The protoc build target is currently located next to build directory
targets. Let's regroup it to instead be located next to the other build
binary targets.
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -375,11 +375,6 @@ ${BUILD_DIR}/bin: | ${BUILD_DIR} ${BUILD_DIR}/go.mod: | ${BUILD_DIR} ${Q}cd ${BUILD_DIR} && go mod init _build -${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR} - ${Q}rm -rf ${BUILD_DIR}/protoc - ${Q}mkdir -p ${BUILD_DIR}/protoc - cd ${BUILD_DIR}/protoc && unzip ${BUILD_DIR}/protoc.zip - # This is a build hack to avoid excessive rebuilding of targets. Instead of # depending on the timestamp of the Makefile, which will change e.g. between # jobs of a CI pipeline, we start depending on its hash. Like this, we only @@ -423,6 +418,11 @@ ${GIT_INSTALL_DIR}/bin/git: ${BUILD_DIR}/git_full_bins.tgz tar -C ${GIT_INSTALL_DIR} -xvzf ${BUILD_DIR}/git_full_bins.tgz endif +${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR} + ${Q}rm -rf ${BUILD_DIR}/protoc + ${Q}mkdir -p ${BUILD_DIR}/protoc + cd ${BUILD_DIR}/protoc && unzip ${BUILD_DIR}/protoc.zip + ${GITALYFMT}: | ${BUILD_DIR}/bin ${Q}go build -o $@ ${SOURCE_DIR}/internal/cmd/gitalyfmt |