From bfa8e2b6e25b5a3a72c00c679f039bb79c1e3db7 Mon Sep 17 00:00:00 2001 From: John Sully Date: Mon, 17 Aug 2020 02:25:45 +0000 Subject: [PATCH] Fix ARM build of RocksDB Former-commit-id: 7301d6d5e76b65115e2610a5fc5afee443782d7c --- deps/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deps/Makefile b/deps/Makefile index b2c021227..c1c30ae54 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -1,6 +1,7 @@ # Redis dependency Makefile uname_S:= $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') CCCOLOR="\033[34m" LINKCOLOR="\033[34;1m" @@ -94,6 +95,10 @@ jemalloc: .make-prerequisites rocksdb: .make-prerequisites @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +ifeq ($(uname_M),x86_64) cd rocksdb && PORTABLE=1 USE_SSE=1 FORCE_SSE42=1 $(MAKE) static_lib +else + cd rocksdb && PORTABLE=1 $(MAKE) static_lib +endif .PHONY: rocksdb