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

Jump to bottom

fix: Makefile rocksdb #15422

Merged
merged 11 commits into from
Mar 23, 2023
Merged

fix: Makefile rocksdb #15422

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2342cbc
fix: Makefile rocksdb
robert-zaremba Mar 16, 2023
db5c44e
formatting fix
robert-zaremba Mar 16, 2023
3ff942d
Merge branch 'main' into robert/makefile-rocksdb
tac0turtle Mar 17, 2023
a6c5656
remove unneeded flag
tac0turtle Mar 17, 2023
9cba40e
add it back
tac0turtle Mar 17, 2023
64739b7
Merge branch 'main' into robert/makefile-rocksdb
tac0turtle Mar 17, 2023
173f274
Merge branch 'main' into robert/makefile-rocksdb
robert-zaremba Mar 22, 2023
cb92bbb
remove rocksdb from default build tags and unify usage of build_tags
robert-zaremba Mar 22, 2023
6ccbb0e
Update Makefile
robert-zaremba Mar 23, 2023
0813be0
Merge branch 'main' into robert/makefile-rocksdb
robert-zaremba Mar 23, 2023
de9f43f
Merge branch 'main' into robert/makefile-rocksdb
robert-zaremba Mar 23, 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
15 changes: 7 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
# process linker flags

ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \
-X github.com/cosmos/cosmos-sdk/version.AppName=simd \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION)
-X github.com/cosmos/cosmos-sdk/version.AppName=simd \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION)

ifeq ($(ENABLE_ROCKSDB),true)
robert-zaremba marked this conversation as resolved.
Show resolved Hide resolved
BUILD_TAGS += rocksdb_build
test_tags += rocksdb_build
BUILD_TAGS += rocksdb
test_tags += rocksdb
endif

# DB backend selection
Expand All @@ -82,7 +82,6 @@ ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS)))
$(error Cannot use RocksDB backend unless ENABLE_ROCKSDB=true)
endif
CGO_ENABLED=1
BUILD_TAGS += rocksdb
robert-zaremba marked this conversation as resolved.
Show resolved Hide resolved
endif
# handle boltdb
ifeq (boltdb,$(findstring boltdb,$(COSMOS_BUILD_OPTIONS)))
Expand Down