[FOLD]

cppalliance · Dec 3, 2024 · 245d0e2 · 245d0e2
1 parent 82714e8
commit 245d0e2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/third-party/llvm/CMakePresets.json b/third-party/llvm/CMakePresets.json
@@ -16,7 +16,6 @@
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
         "LLVM_ENABLE_PROJECTS": "clang",
         "LLVM_ENABLE_RUNTIMES": "libcxx;libcxxabi;libunwind",
-        "LIBCXX_CXX_ABI": "libcxxabi",
         "LLVM_TARGETS_TO_BUILD": "Native",
         "LLVM_UNREACHABLE_OPTIMIZE": false,
         "LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION": false,
@@ -29,6 +28,7 @@
         "LIBCXXABI_ENABLE_SHARED": false,
         "LIBUNWIND_ENABLE_SHARED": false,
         "LIBCXX_ENABLE_STATIC_ABI_LIBRARY": true,
+        "LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY": true,
 
         "LLVM_INCLUDE_BENCHMARKS": false,
         "LLVM_INCLUDE_DOCS": false,
@@ -94,7 +94,7 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "LLVM_ENABLE_RUNTIMES": "libcxx;libcxxabi",
+        "LLVM_ENABLE_RUNTIMES": "libcxx",
         "LIBCXXABI_USE_LLVM_UNWINDER": false,
         "CMAKE_C_FLAGS": "/DWIN32 /D_WINDOWS",
         "CMAKE_CXX_FLAGS": "/DWIN32 /D_WINDOWS /EHsc",
@@ -119,7 +119,7 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "LLVM_ENABLE_RUNTIMES": "libcxx;libcxxabi",
+        "LLVM_ENABLE_RUNTIMES": "libcxx",
         "LIBCXXABI_USE_LLVM_UNWINDER": false,
         "CMAKE_C_FLAGS": "/DWIN32 /D_WINDOWS /Ob1 /O2 /Zi",
         "CMAKE_CXX_FLAGS": "/DWIN32 /D_WINDOWS /Ob1 /O2 /Zi",
@@ -138,7 +138,7 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "LLVM_ENABLE_RUNTIMES": "libcxx;libcxxabi",
+        "LLVM_ENABLE_RUNTIMES": "libcxx",
         "LIBCXXABI_USE_LLVM_UNWINDER": false
       }
     },
@@ -150,7 +150,7 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "LLVM_ENABLE_RUNTIMES": "libcxx;libcxxabi",
+        "LLVM_ENABLE_RUNTIMES": "libcxx",
         "LIBCXXABI_USE_LLVM_UNWINDER": false
       }
     },