diff options
| author | TredwellGit <tredwell@tutanota.com> | 2020-10-11 08:42:56 -0400 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:29:13 +0000 |
| commit | 51da610320fbb39fa9fca2ce9f2079ee1cccf76b (patch) | |
| tree | f86541a395b18a8479d431c92ab07675e2e4b465 /nixpkgs/pkgs | |
| parent | 7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87 (diff) | |
| download | nixlib-51da610320fbb39fa9fca2ce9f2079ee1cccf76b.tar nixlib-51da610320fbb39fa9fca2ce9f2079ee1cccf76b.tar.gz nixlib-51da610320fbb39fa9fca2ce9f2079ee1cccf76b.tar.bz2 nixlib-51da610320fbb39fa9fca2ce9f2079ee1cccf76b.tar.lz nixlib-51da610320fbb39fa9fca2ce9f2079ee1cccf76b.tar.xz nixlib-51da610320fbb39fa9fca2ce9f2079ee1cccf76b.tar.zst nixlib-51da610320fbb39fa9fca2ce9f2079ee1cccf76b.zip | |
llvm_11: link to the llvm compiler-rt share directory from the wrapper (#100190)
A port of #85925 for LLVM 11 to enable CFI for Chromium. This is required for features such as `-fsanitize=cfi` that (by default) load the file `…/resource-root/share/cfi_blacklist.txt`. (cherry picked from commit 03dd1b355b6c7379500becdf170850a5a1dfea5a)
Diffstat (limited to 'nixpkgs/pkgs')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/11/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index dc75fe9f96e7..eb2349f0acd6 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -24,6 +24,7 @@ let mkdir "$rsrc" ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags |