mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-10 12:59:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Generalize rt.dso_windows to rt.dso, for Posix too

Browse source 
Addressing #3786.
This commit is contained in:
Martin Kinkelin 2021-10-15 16:25:11 +02:00
parent df70a35866
commit 694edca0ac
7 changed files with 75 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

10
driver/linker-gcc.cpp
View file

@ -489,6 +489,14 @@ void ArgsBuilder::build(llvm::StringRef outputPath,
args.push_back(objfile);
}
// add precompiled rt.dso object file (in lib directory) when linking
// against shared druntime
const auto &libDirs = ConfigFile::instance.libDirs();
if (!defaultLibNames.empty() && linkAgainstSharedDefaultLibs() &&
!libDirs.empty()) {
args.push_back((llvm::Twine(libDirs[0]) + "/ldc_rt.dso.o").str());
}
// Link with profile-rt library when generating an instrumented binary.
if (opts::isInstrumentingForPGO()) {
addProfileRuntimeLinkFlags(*global.params.targetTriple);
@ -533,7 +541,7 @@ void ArgsBuilder::build(llvm::StringRef outputPath,
addUserSwitches();
// lib dirs
for (const char *dir_c : ConfigFile::instance.libDirs()) {
for (const char *dir_c : libDirs) {
const llvm::StringRef dir(dir_c);
if (!dir.empty())
args.push_back(("-L" + dir).str());