From fb917de147f9db59ca0ec55d69e5ba83f1c1401f Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 04:51:34 -0400 Subject: [PATCH] llvmPackages_18.libcxx: fix building on windows --- pkgs/development/compilers/llvm/common/libcxx/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index 17c687f88394..d4b727bd50d2 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -61,7 +61,8 @@ let ]) ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [ + # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245 "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -91,6 +92,9 @@ let "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + # https://github.com/llvm/llvm-project/issues/55245 + "-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON" ] ++ lib.optionals (!enableShared) [ "-DLIBCXX_ENABLE_SHARED=OFF" ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [