diff options
| author | feistel <6742251-feistel@users.noreply.gitlab.com> | 2022-04-28 18:03:16 +0300 |
|---|---|---|
| committer | feistel <6742251-feistel@users.noreply.gitlab.com> | 2022-04-28 18:06:49 +0300 |
| commit | 6e3082789326071e6be0b2d8f3ac52f86b2a12a6 (patch) | |
| tree | af5365badf64e11e26089a4060018b2612287203 | |
| parent | 9857f7d70983e7af2f0702035c67743d9e1fa3c0 (diff) | |
Remove CGO_ENABLED var from makefiles
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.build.mk | 1 | ||||
| -rw-r--r-- | Makefile.util.mk | 2 |
3 files changed, 1 insertions, 5 deletions
@@ -1,9 +1,6 @@ IMPORT_PATH := gitlab.com/gitlab-org/gitlab-pages V := 1 -# GitLab Pages is statically compiled without CGO to help it in chroot mode -export CGO_ENABLED := 0 - include Makefile.build.mk include Makefile.util.mk include Makefile.internal.mk diff --git a/Makefile.build.mk b/Makefile.build.mk index c598e4c7..3289573d 100644 --- a/Makefile.build.mk +++ b/Makefile.build.mk @@ -3,7 +3,6 @@ GO_BUILD_TAGS := continuous_profiler_stackdriver FIPS_MODE ?= 0 ifeq ($(FIPS_MODE), 1) GO_BUILD_TAGS := $(GO_BUILD_TAGS),fips - CGO_ENABLED := 1 endif # To compute a unique and deterministic value for GNU build-id, we build the Go binary a second time. diff --git a/Makefile.util.mk b/Makefile.util.mk index c00cf08e..82eafd3b 100644 --- a/Makefile.util.mk +++ b/Makefile.util.mk @@ -16,7 +16,7 @@ test: .GOPATH/.ok bin/gotestsum gitlab-pages ./bin/gotestsum --junitfile junit-test-report.xml --format testname -- ./... ${ARGS} race: .GOPATH/.ok bin/gotestsum gitlab-pages - CGO_ENABLED=1 ./bin/gotestsum --junitfile junit-test-report.xml --format testname -- -race $(if $V,-v) ./... ${ARGS} + ./bin/gotestsum --junitfile junit-test-report.xml --format testname -- -race $(if $V,-v) ./... ${ARGS} acceptance: .GOPATH/.ok bin/gotestsum gitlab-pages ./bin/gotestsum --junitfile junit-test-report.xml --format testname -- $(if $V,-v) ./test/acceptance ${ARGS} |