diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-04-24 11:14:05 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:52 +0000 |
| commit | a6d02c7dc663b40537fdd3f64a54055de7429d9d (patch) | |
| tree | 1efa38dd5c1d8042f3e444f4b92c7ce42fa9dec5 /nixpkgs/pkgs/development/compilers | |
| parent | 11cdab9a5dd9caf853818ea9c0676a9077b0d1db (diff) | |
| download | nixlib-a6d02c7dc663b40537fdd3f64a54055de7429d9d.tar nixlib-a6d02c7dc663b40537fdd3f64a54055de7429d9d.tar.gz nixlib-a6d02c7dc663b40537fdd3f64a54055de7429d9d.tar.bz2 nixlib-a6d02c7dc663b40537fdd3f64a54055de7429d9d.tar.lz nixlib-a6d02c7dc663b40537fdd3f64a54055de7429d9d.tar.xz nixlib-a6d02c7dc663b40537fdd3f64a54055de7429d9d.tar.zst nixlib-a6d02c7dc663b40537fdd3f64a54055de7429d9d.zip | |
llvm_10: link to the llvm compiler-rt share directory from the wrapper
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)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/10/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
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 |