[llvm] 22af2a4 - [gn build] (manually) port 9c30bafd59bf1

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2022-02-15T13:33:19-05:00
New Revision: 22af2a482e4614a5d17f8ad11197a48bda162334

URL: https://github.com/llvm/llvm-project/commit/22af2a482e4614a5d17f8ad11197a48bda162334
DIFF: https://github.com/llvm/llvm-project/commit/22af2a482e4614a5d17f8ad11197a48bda162334.diff

LOG: [gn build] (manually) port 9c30bafd59bf1

This is needed after b432eb5c8412c to keep std::unexpected_handler
around (which libcxxabi uses from libcxx).

Added: 
    

Modified: 
    llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
index 88cfa08795a7..c82634e2bb06 100644
--- a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
@@ -69,7 +69,10 @@ config("cxxabi_config") {
     "-std=c++20",
     "-nostdinc++",
   ]
-  defines = [ "_LIBCXXABI_BUILDING_LIBRARY" ]
+  defines = [
+    "_LIBCXXABI_BUILDING_LIBRARY",
+    "_LIBCPP_BUILDING_LIBRARY",
+  ]
   if (target_os == "win") {
     defines += [ "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" ]
   }