Skip to content

Commit

Permalink
[libc++][hardening][NFC] Remove the LIBCXX_DEBUG_BUILD CMake variable.
Browse files Browse the repository at this point in the history
It's no longer necessary to define `_DEBUG` because we use our own
internal assertion mechanism in libc++.

Differential Revision: https://reviews.llvm.org/D155038
  • Loading branch information
var-const committed Jul 12, 2023
1 parent 6ed48eb commit 1ba514c
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions libcxx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,6 @@ if (LIBCXX_GENERATE_COVERAGE)
set(CMAKE_BUILD_TYPE "COVERAGE" CACHE STRING "" FORCE)
endif()

string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
if (uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
set(LIBCXX_DEBUG_BUILD ON)
else()
set(LIBCXX_DEBUG_BUILD OFF)
endif()

#===============================================================================
# Setup Compiler Flags
#===============================================================================
Expand Down Expand Up @@ -595,13 +588,6 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY AND LIBCXX_ENABLE_SHARED)
endif()
endif()

# Assertion flags =============================================================
define_if(LIBCXX_DEBUG_BUILD -D_DEBUG)
if (LIBCXX_ENABLE_ASSERTIONS AND NOT LIBCXX_DEBUG_BUILD)
# MSVC doesn't like _DEBUG on release builds. See PR 4379.
define_if_not(MSVC -D_DEBUG)
endif()

# Modules flags ===============================================================
# FIXME The libc++ sources are fundamentally non-modular. They need special
# versions of the headers in order to provide C++03 and legacy ABI definitions.
Expand All @@ -614,6 +600,8 @@ function(cxx_add_module_flags target)
endif()
endfunction()

string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)

# Sanitizer flags =============================================================

function(get_sanitizer_flags OUT_VAR USE_SANITIZER)
Expand Down Expand Up @@ -721,7 +709,7 @@ function(cxx_link_system_libraries target)
endif()

if (MSVC)
if (LIBCXX_DEBUG_BUILD)
if (uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
set(LIB_SUFFIX "d")
else()
set(LIB_SUFFIX "")
Expand Down

0 comments on commit 1ba514c

Please sign in to comment.