Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci/hotfix: demise buildarg=pie #282

Merged
merged 4 commits into from
Aug 14, 2023
Merged

ci/hotfix: demise buildarg=pie #282

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ab6ebb
chore(make): revert to #270
piyoki Aug 14, 2023
cc61bbc
ci(seed-build): revert to #270
piyoki Aug 14, 2023
6aa555b
ci(seed-build): revert to 5cb7b4c
piyoki Aug 14, 2023
458d510
fix: clean up
piyoki Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down