From 56bb8b73a62b5c3684f48225fe54b2c95cd6a884 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 26 Aug 2023 12:17:29 +0200 Subject: [PATCH 1/3] llvmPackages_15.libcxxabi: fix build on Linux and Darwin The previous fix in 314584b2 broke *-linux. --- pkgs/development/compilers/llvm/15/libcxxabi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index ec61918e341a..77ba2d2d008a 100644 --- a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). From e5e3e6e4d6a643d89ddaa156786eb2cb2fd3c7ea Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 26 Aug 2023 12:17:52 +0200 Subject: [PATCH 2/3] llvmPackages_16.libcxxabi: fix build on Linux and Darwin The previous fix in adc89508 broke *-linux. --- pkgs/development/compilers/llvm/16/libcxxabi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index ec61918e341a..77ba2d2d008a 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). From 6d6210ee9b9e8c9ecf47421675fb6396c992e467 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 26 Aug 2023 12:18:07 +0200 Subject: [PATCH 3/3] llvmPackages_git.libcxxabi: fix build on Linux and Darwin The previous fix in db0c2564 broke *-linux. --- pkgs/development/compilers/llvm/git/libcxxabi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index b65a480117ee..362de957886d 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).