diff --git a/build/common.mk b/build/common.mk index 0263ce13eae4..65f6297ed03b 100644 --- a/build/common.mk +++ b/build/common.mk @@ -386,7 +386,7 @@ $(ROCKSDB_DIR)/Makefile: $(C_DEPS_DIR)/rocksdb-rebuild | libsnappy $(if $(USE_ST @# NOTE: If you change the CMake flags below, bump the version in @# $(C_DEPS_DIR)/rocksdb-rebuild. See above for rationale. cd $(ROCKSDB_DIR) && cmake $(CMAKE_FLAGS) $(ROCKSDB_SRC_DIR) \ - $(if $(findstring release,$(TYPE)),,-DWITH_$(if $(findstring mingw,$(TARGET_TRIPLE)),AVX2,SSE42)=OFF) \ + -DWITH_$(if $(findstring mingw,$(TARGET_TRIPLE)),AVX2,SSE42)=OFF \ -DSNAPPY_LIBRARIES=$(SNAPPY_DIR)/libsnappy.a -DSNAPPY_INCLUDE_DIR="$(SNAPPY_SRC_DIR);$(SNAPPY_DIR)" -DWITH_SNAPPY=ON \ $(if $(USE_STDMALLOC),,-DJEMALLOC_LIBRARIES=$(JEMALLOC_DIR)/lib/libjemalloc.a -DJEMALLOC_INCLUDE_DIR=$(JEMALLOC_DIR)/include -DWITH_JEMALLOC=ON) \ $(if $(ENABLE_ROCKSDB_ASSERTIONS),,-DCMAKE_CXX_FLAGS=-DNDEBUG) diff --git a/c-deps/rocksdb b/c-deps/rocksdb index 0403a97f12d4..288be37c6b96 160000 --- a/c-deps/rocksdb +++ b/c-deps/rocksdb @@ -1 +1 @@ -Subproject commit 0403a97f12d46b05bc48fe99a7b432eca4832bd6 +Subproject commit 288be37c6b96c36308c67be3615fd1d6b0fb5ace