From 85a06c64e344f522fdabdb6df8f14184a24c9df4 Mon Sep 17 00:00:00 2001 From: Jeev B Date: Tue, 11 Apr 2023 21:44:21 -0700 Subject: [PATCH] fix makefile to read variables from environment and overrides Signed-off-by: Jeev B --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 331cfb4d0..df3dcd379 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ docker_build_scheduler: docker build -t $$FLYTE_SCHEDULER_REPOSITORY:$(GIT_HASH) -f Dockerfile.scheduler . .PHONY: integration -integration: export CGO_ENABLED = 0 -integration: export GOFLAGS = -count=1 +integration: export CGO_ENABLED ?= 0 +integration: export GOFLAGS ?= -count=1 integration: go test -v -tags=integration ./tests/... @@ -53,14 +53,14 @@ compile_scheduler_debug: .PHONY: linux_compile -linux_compile: export CGO_ENABLED = 0 -linux_compile: export GOOS = linux +linux_compile: export CGO_ENABLED ?= 0 +linux_compile: export GOOS ?= linux linux_compile: go build -o /artifacts/flyteadmin -ldflags=$(LD_FLAGS) ./cmd/ .PHONY: linux_compile_scheduler -linux_compile_scheduler: export CGO_ENABLED = 0 -linux_compile_scheduler: export GOOS = linux +linux_compile_scheduler: export CGO_ENABLED ?= 0 +linux_compile_scheduler: export GOOS ?= linux linux_compile_scheduler: go build -o /artifacts/flytescheduler -ldflags=$(LD_FLAGS) ./cmd/scheduler/