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>2022-05-20 16:05:29 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-05-20 16:09:19 +0300
commit0fb36f14f29d1397cee6c664e90938c5737279e3 (patch)
tree1e7c7a0dda83a6f1dfa1424c2903aeec825638c5
parent5c57bbfef4f37bcca64e3db2e147265450b86300 (diff)
Makefile: Fix protoc compile option to disable building tests
The Protobuf project has seemingly renamed their CMake options to all have a `protobuf_` prefix. While the deault options we set still work, this broke the `-DBUILD_TESTS=OFF` switch. Fix this and adapt accordingly to significantly reduce build times of this project. On my machine, it decreases from about 58.9s to 22.8s.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9ae657240..338e03076 100644
--- a/Makefile
+++ b/Makefile
@@ -106,8 +106,8 @@ ifeq ($(origin PROTOC_BUILD_OPTIONS),undefined)
## Build options for protoc.
PROTOC_BUILD_OPTIONS ?=
PROTOC_BUILD_OPTIONS += -DBUILD_SHARED_LIBS=NO
- PROTOC_BUILD_OPTIONS += -DBUILD_TESTS=OFF
PROTOC_BUILD_OPTIONS += -DCMAKE_INSTALL_PREFIX=${PROTOC_INSTALL_DIR}
+ PROTOC_BUILD_OPTIONS += -Dprotobuf_BUILD_TESTS=OFF
endif
# Git target