From a6d02c7dc663b40537fdd3f64a54055de7429d9d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 24 Apr 2020 11:14:05 +0200 Subject: llvm_10: link to the llvm compiler-rt share directory from the wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required for features such as `-fsanitze=cfi` that (by default) load the file `…/resource-root/share/cfi_blacklist.txt`. (cherry picked from commit d17650b654aa649ee5161b629d70b62c265b1825) --- nixpkgs/pkgs/development/compilers/llvm/10/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixpkgs/pkgs/development/compilers') diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 37ab89a5a315..3d2cb3544b9f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/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 && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags -- cgit 1.4.1