]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: don't pass ccache argument to RocksDB build 39388/head
authorSheng Mao <shngmao@gmail.com>
Wed, 10 Feb 2021 03:14:58 +0000 (20:14 -0700)
committerSheng Mao <shngmao@gmail.com>
Wed, 10 Feb 2021 03:17:53 +0000 (20:17 -0700)
RocksDB's cmake has a similar logic to turn on ccache as the main cmake.
Currently BuildRocksDB.cmake explicitly passes ccache to RocksDB cmake
arguments as CMAKE_CXX_COMPILER_LAUNCHER. This causes a compilation error
on ccache 4.0, especially in make -j mode.

ccache: error: Recursive invocation (the name of the ccache binary must
be "ccache")

This commit lets cmake from RocksDB decide RULE_LAUNCH_COMPILE by itself.

Signed-off-by: Sheng Mao <shngmao@gmail.com>
cmake/modules/BuildRocksDB.cmake

index 58ce26a6acaf6ed6e26fdb0926063acfa730adf4..5ab2e8e49d8abd60cd79cea62a2977af413cb563 100644 (file)
@@ -16,9 +16,6 @@ function(build_rocksdb)
     list(APPEND rocksdb_INTERFACE_LINK_LIBRARIES JeMalloc::JeMalloc)
   endif()
 
-  if (WITH_CCACHE AND CCACHE_FOUND)
-    list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache)
-  endif()
   list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
 
   list(APPEND rocksdb_CMAKE_ARGS -DWITH_SNAPPY=${SNAPPY_FOUND})