From 1832ab2c92eec5d1fee3286cfef6ea82382c9565 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Thu, 8 Oct 2020 15:32:18 +0100 Subject: [PATCH] Makefile: s/TENDERMINT/COSMOS/ (#7486) --- Makefile | 6 ++---- go.sum | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ff5334a905..e077ed22ac 100644 --- a/Makefile +++ b/Makefile @@ -67,12 +67,12 @@ ifeq (badgerdb,$(findstring badgerdb,$(COSMOS_BUILD_OPTIONS))) ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=badgerdb endif # handle rocksdb -ifeq (rocksdb,$(findstring rocksdb,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS))) CGO_ENABLED=1 BUILD_TAGS += rocksdb endif # handle boltdb -ifeq (boltdb,$(findstring boltdb,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (boltdb,$(findstring boltdb,$(COSMOS_BUILD_OPTIONS))) BUILD_TAGS += boltdb endif @@ -110,7 +110,6 @@ $(BUILDDIR)/: mkdir -p $(BUILDDIR)/ build-simd-all: go.sum - docker pull cosmossdk/rbuilder:latest docker rm latest-build || true docker run --volume=$(CURDIR):/sources:ro \ --env TARGET_PLATFORMS='linux/amd64 darwin/amd64 linux/arm64 windows/amd64' \ @@ -122,7 +121,6 @@ build-simd-all: go.sum docker cp -a latest-build:/home/builder/artifacts/ $(CURDIR)/ build-simd-linux: go.sum $(BUILDDIR)/ - docker pull cosmossdk/rbuilder:latest docker rm latest-build || true docker run --volume=$(CURDIR):/sources:ro \ --env TARGET_PLATFORMS='linux/amd64' \ diff --git a/go.sum b/go.sum index 608591dc03..b395dd5f66 100644 --- a/go.sum +++ b/go.sum @@ -581,8 +581,6 @@ github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2l github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tendermint/tendermint v0.34.0-rc3 h1:d7Fsd5rdbxq4GmJ0kRfx7l7LesQM7e70f0ytWLTQ/Go= github.com/tendermint/tendermint v0.34.0-rc3/go.mod h1:BoHcEpjfpBHc1Be7RQz3AHaXFNObcDG7SNHCev6Or4g= -github.com/tendermint/tendermint v0.34.0-rc4 h1:fnPyDFz9QGAU6tjExoQ8ZY63eHkzdBg5StQgDoeuK0s= -github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4= github.com/tendermint/tendermint v0.34.0-rc4.0.20201005135527-d7d0ffea13c6 h1:gqZ0WDpDYgMm/iaiMEXvI1nt/GoWCuwtBomVpUMiAIs= github.com/tendermint/tendermint v0.34.0-rc4.0.20201005135527-d7d0ffea13c6/go.mod h1:BSXqR6vWbOecet726v66qVwSkFDLfEeBrq+EhkKbij4= github.com/tendermint/tm-db v0.6.1 h1:w3X87itMPXopcRPlFiqspEKhw4FXihPk2rnFFkP0zGk=