RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-18 17:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14818 from tchaikov/wip-rocksdb

Browse Source 
rocksdb: sync with upstream

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
This commit is contained in:
Sage Weil 2017-04-28 11:26:54 -05:00 committed by GitHub
commit e1065fed07
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -768,6 +768,8 @@ if (NOT WITH_SYSTEM_ROCKSDB)
# with SSE 4.2. For details refer to rocksdb/util/crc32c.cc.
if (HAVE_INTEL_SSE4_2)
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${SIMD_COMPILE_FLAGS})
else()
list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_SSE42=OFF)
endif()
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR})
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})

2
src/rocksdb

@ -1 +1 @@
Subproject commit 9f2cc59ec5065c828dabbab483506bde681c955c
Subproject commit e15382c09c87a65eaeca9bda233bab503f1e5772