github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3863 from linux-on-ibm-z/scope_s390x

Browse Source 
Add s390x support to build
This commit is contained in:
Bryan Boreham
2022-02-28 18:30:34 +00:00
committed by GitHub
parent 654b57b36c 0b7ec83b1c
commit a774857ba2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -27,9 +27,12 @@ GO_BUILD_FLAGS=-mod vendor -ldflags "-extldflags \"-static\" -X main.version=$(S
ifeq ($(GOARCH),arm)
GO_ENV+=CGO_ENABLED=1
ARM_CC=CC=/usr/bin/arm-linux-gnueabihf-gcc
else ifeq ($(GOARCH),s390x)
GO_ENV+=CGO_ENABLED=1
S390X_CC=CC=/usr/bin/s390x-linux-gnu-gcc
endif
GO=env $(GO_ENV) $(ARM_CC) go
GO=env $(GO_ENV) $(ARM_CC) $(S390X_CC) go
NO_CROSS_COMP=unset GOOS GOARCH
GO_HOST=$(NO_CROSS_COMP); env $(GO_ENV) go

2
backend/Dockerfile
View File

@@ -4,7 +4,7 @@ RUN set -eux; \
export arch_val="$(dpkg --print-architecture)"; \
apt-get update && \
if [ "$arch_val" = "amd64" ]; then \
apt-get install -y libpcap-dev time file shellcheck git gcc-arm-linux-gnueabihf curl build-essential; \
apt-get install -y libpcap-dev time file shellcheck git gcc-arm-linux-gnueabihf curl build-essential gcc-s390x-linux-gnu; \
else \
apt-get install -y libpcap-dev time file shellcheck git curl build-essential; \
fi; \