pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #251255 from reckenrode/libcxxabi-fixes

authored by

Ryan Lahfa and committed by
GitHub 49d77a70 95d9447a

+3 -6
+1 -2
pkgs/development/compilers/llvm/15/libcxxabi/default.nix
··· 68 68 ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ 69 69 "-DLLVM_ENABLE_LIBCXX=ON" 70 70 "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" 71 - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || 72 - (stdenv.hostPlatform.isDarwin && enableShared)) [ 71 + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ 73 72 # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, 74 73 # but that does not appear to be the case for example when building 75 74 # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).
+1 -2
pkgs/development/compilers/llvm/16/libcxxabi/default.nix
··· 68 68 ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ 69 69 "-DLLVM_ENABLE_LIBCXX=ON" 70 70 "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" 71 - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || 72 - (stdenv.hostPlatform.isDarwin && enableShared)) [ 71 + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ 73 72 # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, 74 73 # but that does not appear to be the case for example when building 75 74 # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).
+1 -2
pkgs/development/compilers/llvm/git/libcxxabi/default.nix
··· 68 68 ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ 69 69 "-DLLVM_ENABLE_LIBCXX=ON" 70 70 "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" 71 - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || 72 - (stdenv.hostPlatform.isDarwin && enableShared)) [ 71 + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ 73 72 # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, 74 73 # but that does not appear to be the case for example when building 75 74 # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).