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

Fix ld flags in Makefile #3470

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Fix ld flags in Makefile #3470

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
609e789
Fix ld flags in Makefile
Jul 16, 2024
3bbfb23
Remove unnecessary branching in Makefile
Jul 16, 2024
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
9 changes: 0 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
GIT_REF_TAG := $(shell git describe --tags)
BUILD_TAGS = rocksdb
ifdef OS
# windows
BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG)"
else
ifeq ($(shell uname -m), arm64)
BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG) -extldflags \"-Wa,--noexecstack\""
else
BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG) -extldflags \"-z noexecstack\""
endif
endif
DOCKER_BUILD_ARGS = # E.g. make docker-build "DOCKER_BUILD_ARGS=--tag wasp:devel"

#
Expand Down
Loading