forked from mirrors/nixpkgs
3530837417
When using GNU binutils, clang passes the LLVMgold.so plugin to the
linker for certain operations that require special support in the linker
like doing link time optimization (LTO). When passing the plugin to the
linker's command line, clang assumes that llvm and itself are installed
in the same prefix and thus `/path/to/clang/bin/../lib/LLVMgold.so` is
the plugin.
Since we install clang and llvm to separate store paths, this assumption
does not hold. When clang-unwrapped only had a single output, we worked
around this issue by symlinking `$out/lib/LLVMgold.so` to
`${llvm}/lib/LLVMgold.so`. However since we split all llvm packages into
multiple outputs clang's `$out` no longer has a lib directory and clang
can't discover clangs lib output on its own. As a result LTO was broken.
Instead of introducing yet another hack and having a symlink to
LLVMgold.so in `$out/lib` (despite having `$lib/lib` as well), we patch
clang to use a hard coded path to `${libllvm.lib}/lib` for discovering
`LLVMgold.so`.
Resolves #123361.
14 lines
580 B
Diff
14 lines
580 B
Diff
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
|
|
index 6b6e276b8ce7..7896542a1202 100644
|
|
--- a/lib/Driver/ToolChains/CommonArgs.cpp
|
|
+++ b/lib/Driver/ToolChains/CommonArgs.cpp
|
|
@@ -409,7 +409,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
|
|
|
|
SmallString<1024> Plugin;
|
|
llvm::sys::path::native(
|
|
- Twine(D.Dir) + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + Suffix,
|
|
+ Twine("@libllvmLibdir@" "/LLVMgold") + Suffix,
|
|
Plugin);
|
|
CmdArgs.push_back(Args.MakeArgString(Plugin));
|
|
}
|