diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-08-26 12:12:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-26 12:12:06 +0200 |
| commit | b2c607a567a044011b6f377f95c107904f00d9a4 (patch) | |
| tree | 15042425bc08bd9b187706c84a8c2e096b4a07a2 | |
| parent | Merge pull request #251102 from fabaff/hass-nabucasa-bump (diff) | |
| download | nixpkgs-origin/revert-251255-libcxxabi-fixes.tar.gz | |
Revert "llvmPackages_{15,16,git}.libcxxabi: fix build on Darwin"origin/revert-251255-libcxxabi-fixes
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index ec61918e341a..692a0256e901 100644 --- a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -68,7 +68,8 @@ 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) [ + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || + (stdenv.hostPlatform.isDarwin && enableShared)) [ # 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). diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index ec61918e341a..692a0256e901 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -68,7 +68,8 @@ 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) [ + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || + (stdenv.hostPlatform.isDarwin && enableShared)) [ # 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). diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index b65a480117ee..51020fcdb0ca 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -68,7 +68,8 @@ 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) [ + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || + (stdenv.hostPlatform.isDarwin && enableShared)) [ # 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). |