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:
authorSami Hiltunen <shiltunen@gitlab.com>2021-04-12 13:05:36 +0300
committerSami Hiltunen <shiltunen@gitlab.com>2021-04-12 13:05:36 +0300
commitfbcc6298afe4ed6ab95f7356bdabe8e2dad632bb (patch)
tree4c1258c6e4864d9b502ad08bb39948b5c6650f87 /Makefile
parentd2802ba45eddcfdcc306d6457200002aa6453ee3 (diff)
Generate NOTICE using GOOS=linux
`make notice` produces a different NOTICE file when ran on macOS and Linux. This is due to some linux build tagged files including Linux specific dependencies, namely the cgroup packages. This commit fixes the problem by running the NOTICE generation with GOOS=linux so the resulting NOTICE file matches regardless whether it was generated on macOS or Linux.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index de318376f..bd1d9a237 100644
--- a/Makefile
+++ b/Makefile
@@ -391,7 +391,7 @@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
${BUILD_DIR}/NOTICE: ${GO_LICENSES} clean-ruby-vendor-go
${Q}rm -rf ${BUILD_DIR}/licenses
- ${Q}GOFLAGS="-tags=${GO_BUILD_TAGS}" ${GO_LICENSES} save ./... --save_path=${BUILD_DIR}/licenses
+ ${Q}GOOS=linux GOFLAGS="-tags=${GO_BUILD_TAGS}" ${GO_LICENSES} save ./... --save_path=${BUILD_DIR}/licenses
# some projects may be copied from the Go module cache
# (GOPATH/pkg/mod) and retain strict permissions (444). These
# permissions are not desirable when removing and rebuilding: