This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 365a66291fae944c9173b78042769b566e2d0b8f Author: Christoph Deppisch <[email protected]> AuthorDate: Tue Dec 6 10:56:54 2022 +0100 fix(#3800): Add proper kamel linux binary on MacOS - Fix tabs in Makefile --- script/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/script/Makefile b/script/Makefile index 06293835d..c0fac5537 100644 --- a/script/Makefile +++ b/script/Makefile @@ -393,14 +393,12 @@ maven-overlay: kamel-overlay: @echo "####### Copying kamel CLI to output build directory..." mkdir -p build/_output/bin -ifeq ($(shell uname -m), arm64) - GOOS=linux GOARCH=arm64 go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go -else ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) - GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go +ifeq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) + cp kamel build/_output/bin +else ifeq ($(shell uname -m), arm64) + GOOS=linux GOARCH=arm64 go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go else - @{ \ - cp kamel build/_output/bin \ - } + GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go endif images: build kamel-overlay maven-overlay bundle-kamelets @@ -414,7 +412,7 @@ images-arch: build kamel-overlay maven-overlay bundle-kamelets docker buildx rm --all-inactive --force docker buildx create --append --name builder ifeq ($(shell uname -m), x86_x64) - docker buildx build --platform=linux/amd64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch . + docker buildx build --platform=linux/amd64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch . endif ifeq ($(shell uname -m), aarch64) docker buildx build --platform=linux/arm64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch .
