diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-03-01 19:23:11 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-03-01 19:23:11 +0300 |
| commit | 6f6f25a04766bd7f136732e94f3df67481470108 (patch) | |
| tree | 4a5240ec20793c7465d7c5026a66f1f0c55e9225 | |
| parent | 8808eb387142bf53810118bc1dcfd1019e946086 (diff) | |
| parent | 0232d01c91458dc4c1530b21d6d9dcaee1494335 (diff) | |
Merge branch 'pks-makefile-dont-override-pkg-config-path' into 'master'
Makefile: Don't override PKG_CONFIG_PATH
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5433
Merged-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -274,7 +274,7 @@ GOCACHE_MAX_SIZE_KB ?= 5000000 export GOCACHE ?= ${BUILD_DIR}/cache export GOPROXY ?= https://proxy.golang.org export PATH := ${BUILD_DIR}/bin:${PATH} -export PKG_CONFIG_PATH := ${LIBGIT2_INSTALL_DIR}/lib/pkgconfig +export PKG_CONFIG_PATH := ${LIBGIT2_INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} # Allow the linker flag -D_THREAD_SAFE as libgit2 is compiled with it on FreeBSD export CGO_LDFLAGS_ALLOW = -D_THREAD_SAFE |