From bd75c0a898ff8e3daefb067ed828dd5f85f6f492 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 12 May 2024 23:09:55 +0200 Subject: [PATCH] deployment/docker/Makefile: group app-via-docker-* and package-via-docker-* rules with CGO_ENABLED=1 together for better maintainability --- deployment/docker/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index cbef2582ca..c7f1d18c96 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -112,14 +112,14 @@ app-via-docker-linux-amd64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ CGO_ENABLED=1 GOOS=linux GOARCH=amd64 $(MAKE) app-via-docker-goos-goarch -app-via-docker-linux-arm: - EXTRA_DOCKER_ENVS='GOARM=5' \ - CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) app-via-docker-goos-goarch - app-via-docker-linux-arm64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ CGO_ENABLED=1 GOOS=linux GOARCH=arm64 $(MAKE) app-via-docker-goos-goarch +app-via-docker-linux-arm: + EXTRA_DOCKER_ENVS='GOARM=5' \ + CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) app-via-docker-goos-goarch + app-via-docker-linux-ppc64le: CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le $(MAKE) app-via-docker-goos-goarch @@ -155,14 +155,14 @@ package-via-docker-amd64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ CO_ENABLED=1 GOARCH=amd64 $(MAKE) package-via-docker-goarch -package-via-docker-arm: - EXTRA_DOCKER_ENVS='GOARM=5' \ - CGO_ENABLED=0 GOARCH=arm $(MAKE) package-via-docker-goarch - package-via-docker-arm64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ CGO_ENABLED=1 GOARCH=arm64 $(MAKE) package-via-docker-goarch +package-via-docker-arm: + EXTRA_DOCKER_ENVS='GOARM=5' \ + CGO_ENABLED=0 GOARCH=arm $(MAKE) package-via-docker-goarch + package-via-docker-ppc64le: CGO_ENABLED=0 GOARCH=ppc64le $(MAKE) package-via-docker-goarch