Unverified Commit 3b6d98d2 authored by Rahul Butani's avatar Rahul Butani
Browse files

llvmPackages_15.compiler_rt: apply #196909 to LLVM 15 

`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
parent bc4dbee1

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

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ let 
  useLLVM = stdenv.hostPlatform.useLLVM or false;

  bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";

  haveLibc = stdenv.cc.libc != null;

  inherit (stdenv.hostPlatform) isMusl;

  inherit (stdenv.hostPlatform) isMusl isGnu;



  baseName = "compiler-rt";
@@ -38,7 +38,7 @@ stdenv.mkDerivation { 
    "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"

    "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"

    "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"

  ] ++ lib.optionals (haveLibc && !isMusl) [

  ] ++ lib.optionals (haveLibc && isGnu) [

    "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"

  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [

    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"