From 314584b22233b75823b708474bc325d9e2051f42 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 24 Aug 2023 18:28:16 -0400 Subject: [PATCH 1/3] llvmPackages_15.libcxxabi: fix build on Darwin --- pkgs/development/compilers/llvm/15/libcxxabi/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index 692a0256e901..ec61918e341a 100644 --- a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -68,8 +68,7 @@ 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 && enableShared)) [ + ] ++ 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 adc89508566c013f02ede4c8b78b3df61c3eedb6 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 24 Aug 2023 18:28:25 -0400 Subject: [PATCH 2/3] llvmPackages_16.libcxxabi: fix build on Darwin --- pkgs/development/compilers/llvm/16/libcxxabi/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 692a0256e901..ec61918e341a 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -68,8 +68,7 @@ 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 && enableShared)) [ + ] ++ 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 db0c256417e051b30327ae15df4e0f1063a46054 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 24 Aug 2023 18:28:34 -0400 Subject: [PATCH 3/3] llvmPackages_git.libcxxabi: fix build on Darwin --- pkgs/development/compilers/llvm/git/libcxxabi/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 51020fcdb0ca..b65a480117ee 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -68,8 +68,7 @@ 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 && enableShared)) [ + ] ++ 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).