From 03dd1b355b6c7379500becdf170850a5a1dfea5a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 11 Oct 2020 08:42:56 -0400 Subject: [PATCH] llvm_11: link to the llvm compiler-rt share directory from the wrapper (#100190) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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`. --- pkgs/development/compilers/llvm/11/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index dc75fe9f96e..eb2349f0acd 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