mirror of
https://git.proxmox.com/git/ceph.git
synced 2025-04-28 21:48:04 +00:00
65acd0c244
cherry-pick both, beb1a624921 ("cmake/modules/BuildRocksDB.cmake:
inherit parent's CMAKE_CXX_FLAGS") and 620b68a348f
("cmake/modules/BuildRocksDB.cmake: use string(APPEND ..) when
appropriate")
upstream PR: https://github.com/ceph/ceph/pull/54918
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
[TL: squash patches actually ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
From 620b68a348f07145c49c12668576a89dee8198cb Mon Sep 17 00:00:00 2001
|
|
From: Kefu Chai <tchaikov@gmail.com>
|
|
Date: Fri, 15 Dec 2023 19:01:46 +0800
|
|
Subject: [PATCH] cmake/modules/BuildRocksDB.cmake: inherit parent's CMAKE_CXX_FLAGS
|
|
|
|
CMake allows us to customize `CMAKE_CXX_FLAGS` by setting CXXFLAGS
|
|
environmental variable. and Debian's debhelper also sets CXXFLAGS
|
|
when it builds cmake projects for customizing the building flags.
|
|
|
|
but we fail to populate this setting down when building external
|
|
projects. this is important when it comes to the projects which
|
|
is critical to the performance. RocksDB is one of them.
|
|
|
|
in this change, we pass the `CMAKE_CXX_FLAGS` down in
|
|
`BuildRocksDB.cmake` so that its `CMAKE_CXX_FLAGS` contains
|
|
the same set of `CMAKE_CXX_FLAGS` used by its parent project.
|
|
|
|
this should help with the performance in the bluestore, where
|
|
RocksDB is used.
|
|
|
|
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
|
|
(cherry-picked from beb1a624921d7589db63dea066935b3aa9ce2698)
|
|
---
|
|
cmake/modules/BuildRocksDB.cmake | 4 ++--
|
|
cmake/modules/BuildRocksDB.cmake | 1 +
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
|
|
index f9a28274c40..e0208f6545b 100644
|
|
--- a/cmake/modules/BuildRocksDB.cmake
|
|
+++ b/cmake/modules/BuildRocksDB.cmake
|
|
@@ -57,12 +57,13 @@ function(build_rocksdb)
|
|
endif()
|
|
include(CheckCXXCompilerFlag)
|
|
check_cxx_compiler_flag("-Wno-deprecated-copy" HAS_WARNING_DEPRECATED_COPY)
|
|
+ set(rocksdb_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
if(HAS_WARNING_DEPRECATED_COPY)
|
|
- set(rocksdb_CXX_FLAGS -Wno-deprecated-copy)
|
|
+ string(APPEND rocksdb_CXX_FLAGS " -Wno-deprecated-copy")
|
|
endif()
|
|
check_cxx_compiler_flag("-Wno-pessimizing-move" HAS_WARNING_PESSIMIZING_MOVE)
|
|
if(HAS_WARNING_PESSIMIZING_MOVE)
|
|
- set(rocksdb_CXX_FLAGS "${rocksdb_CXX_FLAGS} -Wno-pessimizing-move")
|
|
+ string(APPEND rocksdb_CXX_FLAGS " -Wno-pessimizing-move")
|
|
endif()
|
|
if(rocksdb_CXX_FLAGS)
|
|
list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_FLAGS='${rocksdb_CXX_FLAGS}')
|