Unverified Commit 49d77a70 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #251255 from reckenrode/libcxxabi-fixes

parents 95d9447a db0c2564

pkgs/development/compilers/llvm/15/libcxxabi/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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).

pkgs/development/compilers/llvm/16/libcxxabi/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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).

pkgs/development/compilers/llvm/git/libcxxabi/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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).