From d3f616bb6c298463b0160a7450de9f955e758ebd Mon Sep 17 00:00:00 2001 From: Jack Chen Date: Fri, 8 Nov 2024 10:59:19 +0800 Subject: [PATCH] fix: Only one ldflags flag is allowed Signed-off-by: Jack Chen --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 1e4d406..db0b897 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ .PHONY: build test clean prepare update docker # change the following boolean flag to enable or disable the Full RELRO (RELocation Read Only) for linux ELF (Executable and Linkable Format) binaries -ENABLE_FULL_RELRO:="true" +ENABLE_FULL_RELRO=true # change the following boolean flag to enable or disable PIE for linux binaries which is needed for ASLR (Address Space Layout Randomization) on Linux, the ASLR support on Windows is enabled by default -ENABLE_PIE:="true" +ENABLE_PIE=true MICROSERVICES=cmd/device-uart @@ -15,15 +15,17 @@ DOCKERS=docker_device_uart VERSION=$(shell cat ./VERSION 2>/dev/null || echo 0.0.0) GIT_SHA=$(shell git rev-parse HEAD) SDKVERSION=$(shell cat ./go.mod | grep 'github.com/edgexfoundry/device-sdk-go/v4 v' | awk '{print $$2}') -GOFLAGS=-ldflags "-X github.com/edgexfoundry/device-uart.Version=$(VERSION) \ - -X github.com/edgexfoundry/device-sdk-go/v4/internal/common.SDKVersion=$(SDKVERSION)" \ - -trimpath -mod=readonly -ifeq ($(ENABLE_FULL_RELRO), "true") - GOFLAGS += -ldflags "-bindnow" +ifeq ($(ENABLE_FULL_RELRO), true) + ENABLE_FULL_RELRO_GOFLAGS = -bindnow endif -ifeq ($(ENABLE_PIE), "true") +GOFLAGS=-ldflags "-X github.com/edgexfoundry/device-uart.Version=$(VERSION) \ + -X github.com/edgexfoundry/device-sdk-go/v4/internal/common.SDKVersion=$(SDKVERSION) \ + $(ENABLE_FULL_RELRO_GOFLAGS)" \ + -trimpath -mod=readonly + +ifeq ($(ENABLE_PIE), true) GOFLAGS += -buildmode=pie endif