Skip to content

Commit 60b7f84

Browse files
committed
Fix errors with cross-build build flags and CGO
1 parent 8fbbf27 commit 60b7f84

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,25 @@ clean:
8181

8282
build:
8383
make -C v1 build
84-
@cp v1/bin/oc-mirror ./cmd/oc-mirror/data/oc-mirror-v1
84+
@cp v1/$(GO_BUILD_BINDIR)/oc-mirror ./cmd/oc-mirror/data/oc-mirror-v1
8585
mkdir -p $(GO_BUILD_BINDIR)
8686
go build $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) $(GO_LD_FLAGS) -o $(GO_BUILD_BINDIR) ./...
8787
.PHONY: build
8888

8989
cross-build-linux-amd64:
90-
+@GOOS=linux GOARCH=amd64 $(MAKE) "$(GO_BUILD_FLAGS)" --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-amd64
90+
+@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(MAKE) --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-amd64
9191
.PHONY: cross-build-linux-amd64
9292

9393
cross-build-linux-ppc64le:
94-
+@GOOS=linux GOARCH=ppc64le $(MAKE) "$(GO_BUILD_FLAGS)" --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-ppc64le
94+
+@CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le $(MAKE) --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-ppc64le
9595
.PHONY: cross-build-linux-ppc64le
9696

9797
cross-build-linux-s390x:
98-
+@GOOS=linux GOARCH=s390x $(MAKE) "$(GO_BUILD_FLAGS)" --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-s390x
98+
+@CGO_ENABLED=0 GOOS=linux GOARCH=s390x $(MAKE) --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-s390x
9999
.PHONY: cross-build-linux-s390x
100100

101101
cross-build-linux-arm64:
102-
+@GOOS=linux GOARCH=arm64 $(MAKE) "$(GO_BUILD_FLAGS)" --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-arm64
102+
+@CGO_ENABLED=0 GOOS=linux GOARCH=arm64 $(MAKE) --no-print-directory build GO_BUILD_BINDIR=$(GO_BUILD_BINDIR)/linux-arm64
103103
.PHONY: cross-build-linux-arm64
104104

105105
cross-build: cross-build-linux-amd64 cross-build-linux-ppc64le cross-build-linux-s390x cross-build-linux-arm64

0 commit comments

Comments
 (0)