diff options
| author | Will Chandler <wchandler@gitlab.com> | 2022-05-20 20:17:05 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2022-05-20 20:17:05 +0300 |
| commit | 080f9fb5c6d7e1e5e3c3e2a5202b3f0a83ddd180 (patch) | |
| tree | 88a798dcf3426d7c662fc4bbb042b6ef1a79804b | |
| parent | 795e7b1fe321decccd846259e993da101f19dd0d (diff) | |
| parent | 0fb36f14f29d1397cee6c664e90938c5737279e3 (diff) | |
Merge branch 'pks-makefile-fix-protobuf-compile-option' into 'master'
Makefile: Fix protoc compile option to disable building tests
See merge request gitlab-org/gitaly!4579
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |