Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.16](backport #4536) use golang-crossbuild native to ARM64 #4540

Open
wants to merge 2 commits into
base: 8.16
Choose a base branch
from
Open

[8.16](backport #4536) use golang-crossbuild native to ARM64 #4540

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef04551
use golang-crossbuild native to ARM64 (#4536)
v1v Mar 4, 2025
9cda5c2
Update Makefile
v1v Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ BUILDMODE_darwin_amd64=-buildmode=pie
BUILDMODE_darwin_arm64=-buildmode=pie

CROSSBUILD_SUFFIX=main-debian11
<<<<<<< HEAD
BUILDER_IMAGE=docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-${CROSSBUILD_SUFFIX}
=======
CROSSBUILD_ARM_SUFFIX=base-arm-debian9
STANDALONE_DOCKERFILE=Dockerfile
BUILDER_IMAGE=fleet-server-builder:${GO_VERSION}
>>>>>>> 3b8d818 (use golang-crossbuild native to ARM64 (#4536))

#Benchmark related targets
BENCH_BASE ?= benchmark-$(COMMIT).out
Expand Down Expand Up @@ -250,7 +256,7 @@ endif

build-releaser: ## - Build a Docker image to run make package including all build tools
ifeq ($(shell uname -p),arm)
$(eval SUFFIX := arm)
$(eval SUFFIX := ${CROSSBUILD_ARM_SUFFIX})
else
$(eval SUFFIX := ${CROSSBUILD_SUFFIX})
endif
Expand Down
Loading