diff options
| author | Rahul Butani <rrbutani@users.noreply.github.com> | 2022-11-29 14:12:29 -0600 |
|---|---|---|
| committer | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-27 13:29:21 -0800 |
| commit | 3b6d98d2b0faee93d8a6388bd06e7de1653f49a7 (patch) | |
| tree | 91bfb095d4fe1fed6b4f2c57f7e1c781b5b1b397 /pkgs/development/compilers | |
| parent | bc4dbee1150281fbd46663ef5e0e80493de9320e (diff) | |
| download | nixlib-3b6d98d2b0faee93d8a6388bd06e7de1653f49a7.tar nixlib-3b6d98d2b0faee93d8a6388bd06e7de1653f49a7.tar.gz nixlib-3b6d98d2b0faee93d8a6388bd06e7de1653f49a7.tar.bz2 nixlib-3b6d98d2b0faee93d8a6388bd06e7de1653f49a7.tar.lz nixlib-3b6d98d2b0faee93d8a6388bd06e7de1653f49a7.tar.xz nixlib-3b6d98d2b0faee93d8a6388bd06e7de1653f49a7.tar.zst nixlib-3b6d98d2b0faee93d8a6388bd06e7de1653f49a7.zip | |
llvmPackages_15.compiler_rt: apply #196909 to LLVM 15
`llvmPackages_15` originates from `llvmPackages_git` which does not include this change
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/15/compiler-rt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index 7b0996845e2e..0a08f4dcf94b 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -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" |