Skip to content

Commit

Permalink
llvmPackages_15.compiler_rt: apply #196909 to LLVM 15
Browse files Browse the repository at this point in the history
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
  • Loading branch information
rrbutani committed Jan 27, 2023
1 parent bc4dbee commit 3b6d98d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/15/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 3b6d98d

Please sign in to comment.