From 70b5b4bfbf078d65331a58f1e7d152c5e1738a30 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 31 Oct 2017 17:39:02 +0800 Subject: [PATCH] cmake: should check the availability of aligned_alloc() by running the test this mimics the failure of rocksdb without a working aligned_alloc()/free(). Signed-off-by: Kefu Chai --- cmake/modules/BuildRocksDB.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake index da6e18d04e0..d62f7458058 100644 --- a/cmake/modules/BuildRocksDB.cmake +++ b/cmake/modules/BuildRocksDB.cmake @@ -1,4 +1,4 @@ -include(CheckCXXSourceCompiles) +include(CheckCXXSourceRuns) function(do_build_rocksdb) set(ROCKSDB_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON) @@ -42,13 +42,13 @@ endfunction() function(check_aligned_alloc) set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) - set(CMAKE_REQUIRED_FLAGS "-std=c++11 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -nostdlib") + set(CMAKE_REQUIRED_FLAGS "-std=c++11 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") if(LINUX) set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE") endif() set(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) set(CMAKE_REQUIRED_LIBRARIES ${GPERFTOOLS_TCMALLOC_LIBRARY}) - CHECK_CXX_SOURCE_COMPILES(" + CHECK_CXX_SOURCE_RUNS(" #include int main() -- 2.39.5