From: Sheng Mao Date: Wed, 10 Feb 2021 03:14:58 +0000 (-0700) Subject: cmake: don't pass ccache argument to RocksDB build X-Git-Tag: v17.1.0~3013^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59a5f333fa3c3e9ef3a9c9d3fded43d23cfce911;p=ceph.git cmake: don't pass ccache argument to RocksDB build 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 --- diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake index 58ce26a6acaf..5ab2e8e49d8a 100644 --- a/cmake/modules/BuildRocksDB.cmake +++ b/cmake/modules/BuildRocksDB.cmake @@ -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})