Restore -DNDEBUG

apache · Jul 21, 2022 · 6dd7bab · 6dd7bab
1 parent e4e430b
commit 6dd7bab
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake
@@ -606,30 +606,30 @@ if(NOT MSVC)
   string(REPLACE "-O3" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
   string(REPLACE "-O3" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 
-  set(RELEASE_OPTIMIZATIONS "-O2")
+  set(RELEASE_FLAGS "-O2 -DNDEBUG")
   if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set(RELEASE_OPTIMIZATIONS "${RELEASE_OPTIMIZATIONS} -ftree-vectorize")
+    set(RELEASE_FLAGS "${RELEASE_FLAGS} -ftree-vectorize")
   endif()
 
   if(ARROW_GGDB_DEBUG)
     set(ARROW_DEBUG_SYMBOL_TYPE "gdb")
     set(C_FLAGS_DEBUG "-g${ARROW_DEBUG_SYMBOL_TYPE} -O0")
     set(C_FLAGS_FASTDEBUG "-g${ARROW_DEBUG_SYMBOL_TYPE} -O1")
-    set(C_FLAGS_RELWITHDEBINFO "-g${ARROW_DEBUG_SYMBOL_TYPE} ${RELEASE_OPTIMIZATIONS}")
+    set(C_FLAGS_RELWITHDEBINFO "-g${ARROW_DEBUG_SYMBOL_TYPE} ${RELEASE_FLAGS}")
     set(CXX_FLAGS_DEBUG "-g${ARROW_DEBUG_SYMBOL_TYPE} -O0")
     set(CXX_FLAGS_FASTDEBUG "-g${ARROW_DEBUG_SYMBOL_TYPE} -O1")
-    set(CXX_FLAGS_RELWITHDEBINFO "-g${ARROW_DEBUG_SYMBOL_TYPE} ${RELEASE_OPTIMIZATIONS}")
+    set(CXX_FLAGS_RELWITHDEBINFO "-g${ARROW_DEBUG_SYMBOL_TYPE} ${RELEASE_FLAGS}")
   else()
     set(C_FLAGS_DEBUG "-g -O0")
     set(C_FLAGS_FASTDEBUG "-g -O1")
-    set(C_FLAGS_RELWITHDEBINFO "-g ${RELEASE_OPTIMIZATIONS}")
+    set(C_FLAGS_RELWITHDEBINFO "-g ${RELEASE_FLAGS}")
     set(CXX_FLAGS_DEBUG "-g -O0")
     set(CXX_FLAGS_FASTDEBUG "-g -O1")
-    set(CXX_FLAGS_RELWITHDEBINFO "-g ${RELEASE_OPTIMIZATIONS}")
+    set(CXX_FLAGS_RELWITHDEBINFO "-g ${RELEASE_FLAGS}")
   endif()
 
-  set(C_FLAGS_RELEASE "${RELEASE_OPTIMIZATIONS}")
-  set(CXX_FLAGS_RELEASE "${RELEASE_OPTIMIZATIONS}")
+  set(C_FLAGS_RELEASE "${RELEASE_FLAGS}")
+  set(CXX_FLAGS_RELEASE "${RELEASE_FLAGS}")
 endif()
 
 set(C_FLAGS_PROFILE_GEN "${CXX_FLAGS_RELEASE} -fprofile-generate")