Skip to content
Snippets Groups Projects
Commit 34e42e93 authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch 'fix-rpi-go-build' into 'master'

Fix Go platform detection on Raspberry Pi for Prometheus

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7708



Merged-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Approved-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Co-authored-by: default avatarRyan Egesdahl <deriamis@gmail.com>
parents 86bfded8 ba2b04cb
1 merge request!143Merge upstream Omnibus GitLab up to the 17.1 branching point
diff --git a/Makefile.common b/Makefile.common
index 0acfb9d80..8fede188e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -40,7 +40,7 @@ PROMU := $(FIRST_GOPATH)/bin/promu
pkgs = ./...
ifeq (arm, $(GOHOSTARCH))
- GOHOSTARM ?= $(shell GOARM= $(GO) env GOARM)
+ GOHOSTARM ?= $(shell GOARM= $(GO) env GOARM | cut -d, -f1)
GO_BUILD_PLATFORM ?= $(GOHOSTOS)-$(GOHOSTARCH)v$(GOHOSTARM)
else
GO_BUILD_PLATFORM ?= $(GOHOSTOS)-$(GOHOSTARCH)
......@@ -44,6 +44,8 @@
prom_version = Prometheus::VersionFlags.new(version)
patch source: 'rpi-correct-platform.patch' if OhaiHelper.raspberry_pi?
make 'build', env: env, cwd: cwd
command "go build -tags netgo,builtinassets,stringlabels -ldflags '#{prom_version.print_ldflags}' ./cmd/prometheus", env: env, cwd: cwd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment