Skip to content

Commit

Permalink
llvm_12: add back --gcc-toolchain logic
Browse files Browse the repository at this point in the history
In master commit 0710308 this was
removed from all LLVM versions, but we don't this commit on 20.09,
so when LLVM 12 was backported, there was no `--gcc-toolchain` in
`llvmPackages_12.stdenv`.
  • Loading branch information
Milan Pässler committed Apr 22, 2021
1 parent a370c98 commit 2774cee
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkgs/development/compilers/llvm/12/default.nix
Expand Up @@ -29,6 +29,8 @@ let
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
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
'';
in {

Expand Down

0 comments on commit 2774cee

Please sign in to comment.