From 4bb25bda9701984c8bfdf55458c9c0b7ad0bf067 Mon Sep 17 00:00:00 2001 From: David Scott Date: Mon, 25 Jul 2022 07:56:57 +0100 Subject: [PATCH] Fix Makefile Before: ``` djs55@m1 linuxkit % make make -C ./src/cmd/linuxkit tar cf - -C . . | docker run --rm --net=none --log-driver=none -i -e GOOS= -e GOARCH= linuxkit/go-compile:7b1f5a37d2a93cd4a9aa2a87db264d8145944006 --package github.com/linuxkit/linuxkit/src/cmd/linuxkit --ldflags "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.GitCommit=a201652e0dabfc7f62b14ac1a43b5572a8ecae9a -X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version="v0.8+"" -o linuxkit > tmp_linuxkit_bin.tar gofmt... govet... golint... ineffassign... go build... djs55@m1 linuxkit % file bin/linuxkit bin/linuxkit: ELF 64-bit LSB pie executable, ARM aarch64, version 1 (SYSV), static-pie linked, Go BuildID=alxJ_URcsHKe5NnzKTgb/kT7Da_wy0_5L3jkAxzZ7/jVuNyKW2yhIE_wT0QFHL/g86-fS2la_qumeAPHD40, stripped djs55@m1 linuxkit % ./bin/linuxkit zsh: exec format error: ./bin/linuxkit ``` After: ``` djs55@m1 linuxkit % make make -C ./src/cmd/linuxkit CGO_ENABLED=1 go build -o /Users/djs55/github.com/djs55/linuxkit/bin/linuxkit --ldflags "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.GitCommit=df47d22bce0a1767e6e0c967d9b516cc656d7db4 -X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version="v0.8+"" codesign --entitlements linuxkit.entitlements --force -s - /Users/djs55/github.com/djs55/linuxkit/bin/linuxkit /Users/djs55/github.com/djs55/linuxkit/bin/linuxkit: replacing existing signature djs55@m1 linuxkit % file ./bin/linuxkit ./bin/linuxkit: Mach-O 64-bit executable arm64 djs55@m1 linuxkit % ./bin/linuxkit Please specify a command. USAGE: linuxkit [options] COMMAND ``` Signed-off-by: David Scott --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 271a440f3..7857f642e 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,16 @@ GO_COMPILE=linuxkit/go-compile:7b1f5a37d2a93cd4a9aa2a87db264d8145944006 ifeq ($(OS),Windows_NT) LINUXKIT?=$(CURDIR)/bin/linuxkit.exe RTF?=bin/rtf.exe +GOOS?=windows else LINUXKIT?=$(CURDIR)/bin/linuxkit RTF?=bin/rtf +GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]') endif -ifneq ($(GOOS),) +ifneq ($(GOOS),linux) CROSS+=-e GOOS=$(GOOS) endif -ifneq ($(GOARCH),) +ifneq ($(GOARCH),amd64) CROSS+=-e GOARCH=$(GOARCH) endif