From fd91ccdb5408fa0fc626c61f05be533053f9bd00 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Thu, 22 Jun 2017 21:20:27 +0000 Subject: [PATCH 1/3] silence dlmalloc warnings on clang-4.0 --- cpp/src/plasma/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt index 992c33ed0fc..1dea7a5e341 100644 --- a/cpp/src/plasma/CMakeLists.txt +++ b/cpp/src/plasma/CMakeLists.txt @@ -91,7 +91,7 @@ ADD_ARROW_LIB(plasma # The optimization flag -O3 is suggested by dlmalloc.c, which is #included in # malloc.cc; we set it here regardless of whether we do a debug or release build. -set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error=conversion -O3") +set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error=conversion -Wno-expansion-to-defined -O3") add_executable(plasma_store store.cc) target_link_libraries(plasma_store plasma_static) From 672ec2ee107a2d2521805b3d9e705c9545f9a1ff Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Thu, 22 Jun 2017 15:03:44 -0700 Subject: [PATCH 2/3] fix on g++ --- cpp/src/plasma/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt index 1dea7a5e341..b7e99e77043 100644 --- a/cpp/src/plasma/CMakeLists.txt +++ b/cpp/src/plasma/CMakeLists.txt @@ -67,7 +67,6 @@ endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -set_source_files_properties(thirdparty/dlmalloc.c PROPERTIES COMPILE_FLAGS -Wno-all) set_source_files_properties(extension.cc PROPERTIES COMPILE_FLAGS -Wno-strict-aliasing) set(PLASMA_SRCS @@ -91,7 +90,7 @@ ADD_ARROW_LIB(plasma # The optimization flag -O3 is suggested by dlmalloc.c, which is #included in # malloc.cc; we set it here regardless of whether we do a debug or release build. -set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error=conversion -Wno-expansion-to-defined -O3") +set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error=conversion -Wno-error -O3") add_executable(plasma_store store.cc) target_link_libraries(plasma_store plasma_static) From 6602c7f578d68db3d064978d7746e002d972e005 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Thu, 22 Jun 2017 15:05:52 -0700 Subject: [PATCH 3/3] clean up --- cpp/src/plasma/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt index b7e99e77043..8f2d81fba78 100644 --- a/cpp/src/plasma/CMakeLists.txt +++ b/cpp/src/plasma/CMakeLists.txt @@ -90,7 +90,7 @@ ADD_ARROW_LIB(plasma # The optimization flag -O3 is suggested by dlmalloc.c, which is #included in # malloc.cc; we set it here regardless of whether we do a debug or release build. -set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error=conversion -Wno-error -O3") +set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error -O3") add_executable(plasma_store store.cc) target_link_libraries(plasma_store plasma_static)