diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-03-05 12:24:57 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-03-09 10:54:51 +0300 |
| commit | 56c901febc2dbfc498d7998cc9229c438ffc7370 (patch) | |
| tree | a51eebbb8cc39e37620888b4dd6b1b9647f7771a | |
| parent | 21abc5a7ac4afe9587169be495b3316e85a613fe (diff) | |
Makefile: Move protoc into TOOLS_DIR
All of our build tools nowadays live in the TOOLS_DIR. Let's move protoc
into it, too.
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -36,11 +36,11 @@ GIT_PREFIX ?= ${GIT_INSTALL_DIR} # Tools GIT := $(shell which git) -PROTOC := ${BUILD_DIR}/protoc/bin/protoc GOIMPORTS := ${TOOLS_DIR}/goimports GITALYFMT := ${TOOLS_DIR}/gitalyfmt GOLANGCI_LINT := ${TOOLS_DIR}/golangci-lint GO_LICENSES := ${TOOLS_DIR}/go-licenses +PROTOC := ${TOOLS_DIR}/protoc/bin/protoc PROTOC_GEN_GO := ${TOOLS_DIR}/protoc-gen-go PROTOC_GEN_GITALY := ${TOOLS_DIR}/protoc-gen-gitaly GO_JUNIT_REPORT := ${TOOLS_DIR}/go-junit-report @@ -456,16 +456,16 @@ ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git_full_bins.tgz tar -C ${GIT_INSTALL_DIR} -xvzf ${DEPENDENCY_DIR}/git_full_bins.tgz endif -${BUILD_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version +${TOOLS_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version ${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi curl -o $@.tmp --silent --show-error -L ${PROTOC_URL} ${Q}printf '${PROTOC_HASH} $@.tmp' | sha256sum -c - ${Q}mv $@.tmp $@ -${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 +${PROTOC}: ${TOOLS_DIR}/protoc.zip + ${Q}rm -rf ${TOOLS_DIR}/protoc + ${Q}mkdir -p ${TOOLS_DIR}/protoc + cd ${TOOLS_DIR}/protoc && unzip ${TOOLS_DIR}/protoc.zip # We're using per-tool go.mod files in order to avoid conflicts in the graph in # case we used a single go.mod file for all tools. |