Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 037c20b3b3ef5e9ead0282aa64f9b88c0c18934d Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Barker <pbarker@toganlabs.com> |
| 3 | Date: Thu, 5 Oct 2017 13:14:40 +0000 |
| 4 | Subject: [PATCH] Use correct go cross-compiler |
| 5 | |
| 6 | We need to use '${GO}' as set by OpenEmbedded instead of just 'go'. Just using |
| 7 | 'go' will invoke go-native. |
| 8 | |
| 9 | Signed-off-by: Paul Barker <pbarker@toganlabs.com> |
| 10 | Upstream-status: Inappropriate |
| 11 | --- |
| 12 | Makefile | 20 ++++++++++---------- |
| 13 | 1 file changed, 10 insertions(+), 10 deletions(-) |
| 14 | |
| 15 | diff --git a/Makefile b/Makefile |
| 16 | index 8117892..0fcf508 100644 |
| 17 | --- a/src/import/Makefile |
| 18 | +++ b/src/import/Makefile |
| 19 | @@ -27,18 +27,18 @@ SHELL := $(shell command -v bash 2>/dev/null) |
| 20 | .DEFAULT: runc |
| 21 | |
| 22 | runc: $(SOURCES) |
| 23 | - go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc . |
| 24 | + $(GO) build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc . |
| 25 | |
| 26 | all: runc recvtty |
| 27 | |
| 28 | recvtty: contrib/cmd/recvtty/recvtty |
| 29 | |
| 30 | contrib/cmd/recvtty/recvtty: $(SOURCES) |
| 31 | - go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty |
| 32 | + $(GO) build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty |
| 33 | |
| 34 | static: $(SOURCES) |
| 35 | - CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc . |
| 36 | - CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty |
| 37 | + CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc . |
| 38 | + CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty |
| 39 | |
| 40 | release: |
| 41 | @flag_list=(seccomp selinux apparmor static); \ |
| 42 | @@ -62,15 +62,15 @@ release: |
| 43 | CGO_ENABLED=1; \ |
| 44 | }; \ |
| 45 | echo "Building target: $$output"; \ |
| 46 | - go build -i $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \ |
| 47 | + $(GO) build -i $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \ |
| 48 | done |
| 49 | |
| 50 | dbuild: runcimage |
| 51 | docker run --rm -v $(CURDIR):/go/src/$(PROJECT) --privileged $(RUNC_IMAGE) make clean all |
| 52 | |
| 53 | lint: |
| 54 | - go vet $(allpackages) |
| 55 | - go fmt $(allpackages) |
| 56 | + $(GO) vet $(allpackages) |
| 57 | + $(GO) fmt $(allpackages) |
| 58 | |
| 59 | man: |
| 60 | man/md2man-all.sh |
| 61 | @@ -88,7 +88,7 @@ unittest: runcimage |
| 62 | docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localunittest |
| 63 | |
| 64 | localunittest: all |
| 65 | - go test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v $(allpackages) |
| 66 | + $(GO) test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v $(allpackages) |
| 67 | |
| 68 | integration: runcimage |
| 69 | docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localintegration |
| 70 | @@ -134,10 +134,10 @@ clean: |
| 71 | validate: |
| 72 | script/validate-gofmt |
| 73 | script/validate-shfmt |
| 74 | - go vet $(allpackages) |
| 75 | + $(GO) vet $(allpackages) |
| 76 | |
| 77 | ci: validate localtest |
| 78 | |
| 79 | # memoize allpackages, so that it's executed only once and only if used |
| 80 | -_allpackages = $(shell go list ./... | grep -v vendor) |
| 81 | +_allpackages = $(shell $(GO) list ./... | grep -v vendor) |
| 82 | allpackages = $(if $(__allpackages),,$(eval __allpackages := $$(_allpackages)))$(__allpackages) |
| 83 | -- |
| 84 | 2.7.4 |
| 85 | |