Merge pull request #4994 from jackchenjc/issue-4916-3

fix: Only one ldflags flag is allowed
edgexfoundry · Nov 8, 2024 · 86a4aa5 · 86a4aa5
2 parents 44a947b + fcb5d6c
commit 86a4aa5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -60,13 +60,13 @@ MICROSERVICES= \
 VERSION=$(shell cat ./VERSION 2>/dev/null || echo 0.0.0)
 DOCKER_TAG=$(VERSION)-dev
 
-GOFLAGS=-ldflags "-s -w -X github.com/edgexfoundry/edgex-go.Version=$(VERSION)" -trimpath -mod=readonly
-GOTESTFLAGS?=-race
-
-ifeq ($(ENABLE_FULL_RELRO), "true")
-	GOFLAGS += -ldflags "-bindnow"
+ifeq ($(ENABLE_FULL_RELRO), true)
+	ENABLE_FULL_RELRO_GOFLAGS = -bindnow
 endif
 
+GOFLAGS=-ldflags "-s -w -X github.com/edgexfoundry/edgex-go.Version=$(VERSION) $(ENABLE_FULL_RELRO_GOFLAGS)" -trimpath -mod=readonly
+GOTESTFLAGS?=-race
+
 ifeq ($(ENABLE_PIE), "true")
 	GOFLAGS += -buildmode=pie
 endif