From 5b4f9e03b322121cae6b274fb9ced402e68373de Mon Sep 17 00:00:00 2001 From: kev <31861128+yqlbu@users.noreply.github.com> Date: Mon, 14 Aug 2023 19:16:23 +0800 Subject: [PATCH] ci/hotfix: demise buildarg=pie (#282) --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 44c5fbd..fbd390f 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,6 @@ else ifeq ($(wildcard $(STRIP_PATH)),) else STRIP_FLAG := -strip=$(STRIP_PATH) endif -GOARCH ?= $(shell go env GOARCH) # Do NOT remove the line below. This line is for CI. #export GOMODCACHE=$(PWD)/go-mod @@ -37,12 +36,7 @@ else VERSION ?= unstable-$(date).r$(count).$(commit) endif -# amd64 and arm64 use PIE build mode by default -ifeq ($(GOARCH),$(filter $(GOARCH),amd64 arm64)) - BUILD_MODE ?= -buildmode=pie -endif - -BUILD_ARGS := -trimpath -ldflags "-s -w -X github.com/daeuniverse/dae/cmd.Version=$(VERSION) -X github.com/daeuniverse/dae/common/consts.MaxMatchSetLen_=$(MAX_MATCH_SET_LEN)" $(BUILD_MODE) $(BUILD_ARGS) +BUILD_ARGS := -trimpath -ldflags "-s -w -X github.com/daeuniverse/dae/cmd.Version=$(VERSION) -X github.com/daeuniverse/dae/common/consts.MaxMatchSetLen_=$(MAX_MATCH_SET_LEN)" $(BUILD_ARGS) .PHONY: clean-ebpf ebpf dae submodule submodules