Unverified Commit 6f7816d6 authored by Alyssa Ross's avatar Alyssa Ross Committed by GitHub
Browse files

llvmPackages.compiler-rt: clean up libxcrypt fix (#447574)

parents 85366600 4d44f8fa

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
  libcxx,

  linuxHeaders,

  freebsd,

  libxcrypt,



  # Some platforms have switched to using compiler-rt, but still want a

  # libgcc.a for ABI compat purposes. The use case would be old code that
@@ -123,9 +122,6 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeFeature "CMAKE_C_COMPILER_TARGET" stdenv.hostPlatform.config)

    (lib.cmakeFeature "CMAKE_ASM_COMPILER_TARGET" stdenv.hostPlatform.config)

  ]

  ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [

    (lib.cmakeFeature "SANITIZER_COMMON_CFLAGS" "-I${libxcrypt}/include")

  ]

  ++ lib.optionals (useLLVM && haveLibc && stdenv.cc.libcxx == libcxx) [

    (lib.cmakeFeature "SANITIZER_CXX_ABI" "libcxxabi")

    (lib.cmakeFeature "SANITIZER_CXX_ABI_LIBNAME" "libcxxabi")

pkgs/development/compilers/llvm/common/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -425,11 +425,6 @@ let 
          {

            inherit stdenv;

          }

          // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {

            libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {

              configureFlags = old.configureFlags ++ [ "--disable-symvers" ];

            });

          }

        );



        compiler-rt-no-libc = callPackage ./compiler-rt {