diff options
| author | TredwellGit <tredwell@tutanota.com> | 2020-10-11 08:42:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-11 14:42:56 +0200 |
| commit | 03dd1b355b6c7379500becdf170850a5a1dfea5a (patch) | |
| tree | 85e43efab3993525f37d88a7a5649d2805b38f1d | |
| parent | Merge pull request #85925 from andir/llvm-cfi (diff) | |
| download | nixpkgs-03dd1b355b6c7379500becdf170850a5a1dfea5a.tar.gz | |
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`.
| -rw-r--r-- | pkgs/development/compilers/llvm/11/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index dc75fe9f96e7..eb2349f0acd6 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/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 |