[flang-commits] [flang] 7783bba - [flang] Disable libstdc++ assertions in the runtime library

[Jay Foad via flang-commits]

Author: Jay Foad
Date: 2023-02-02T17:34:18Z
New Revision: 7783bba22c7add678d796741d30669c73159b3d8

URL: https://github.com/llvm/llvm-project/commit/7783bba22c7add678d796741d30669c73159b3d8
DIFF: https://github.com/llvm/llvm-project/commit/7783bba22c7add678d796741d30669c73159b3d8.diff

LOG: [flang] Disable libstdc++ assertions in the runtime library

Differential Revision: https://reviews.llvm.org/D143168

Added: 
    

Modified: 
    flang/lib/Decimal/CMakeLists.txt
    flang/runtime/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang/lib/Decimal/CMakeLists.txt b/flang/lib/Decimal/CMakeLists.txt
index 55c236fdf1a43..5c5a498f1a3ca 100644
--- a/flang/lib/Decimal/CMakeLists.txt
+++ b/flang/lib/Decimal/CMakeLists.txt
@@ -42,7 +42,9 @@ if (FLANG_RUNTIME_HAS_FNO_LTO_FLAG)
   append("-fno-lto" CMAKE_CXX_FLAGS)
 endif()
 
-
+# Disable libstdc++ assertions, even in an LLVM_ENABLE_ASSERTIONS build, to
+# avoid an unwanted dependency on libstdc++.so.
+add_definitions(-U_GLIBCXX_ASSERTIONS)
 
 add_flang_library(FortranDecimal INSTALL_WITH_TOOLCHAIN
   binary-to-decimal.cpp

diff  --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt
index 942500678a674..e0a8f2c44145f 100644
--- a/flang/runtime/CMakeLists.txt
+++ b/flang/runtime/CMakeLists.txt
@@ -86,6 +86,10 @@ include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR})
 append(${NO_LTO_FLAGS} CMAKE_C_FLAGS)
 append(${NO_LTO_FLAGS} CMAKE_CXX_FLAGS)
 
+# Disable libstdc++ assertions, even in an LLVM_ENABLE_ASSERTIONS build, to
+# avoid an unwanted dependency on libstdc++.so.
+add_definitions(-U_GLIBCXX_ASSERTIONS)
+
 add_subdirectory(FortranMain)
 
 add_flang_library(FortranRuntime