Skip to content
Snippets Groups Projects
Commit 2746c61e authored by Saleem Abdulrasool's avatar Saleem Abdulrasool Committed by Brad King
Browse files

Swift: Add library search paths for dependencies

When building Swift executables and libraries which import a module, an
implicit link will be added by the driver.  Because this links by name
rather than path, the library search path needs to be provided to
indicate where to find the library.  For all local dependencies, add the
library paths for the targets when linking.  This ensures that you can
link against local libraries without explicitly setting a library path.

Fixes: #19304
parent 77e59e44
No related branches found
No related tags found
No related merge requests found
......@@ -99,14 +99,34 @@ std::string cmLinkLineComputer::ComputeLinkPath(
std::string const& libPathTerminator)
{
std::string linkPath;
std::vector<std::string> const& libDirs = cli.GetDirectories();
for (std::string const& libDir : libDirs) {
std::string libpath = this->ConvertToOutputForExisting(libDir);
linkPath += " " + libPathFlag;
linkPath += libpath;
linkPath += libPathTerminator;
linkPath += " ";
if (cli.GetLinkLanguage() == "Swift") {
for (const cmComputeLinkInformation::Item& item : cli.GetItems()) {
const cmGeneratorTarget* target = item.Target;
if (!target) {
continue;
}
if (target->GetType() == cmStateEnums::STATIC_LIBRARY ||
target->GetType() == cmStateEnums::SHARED_LIBRARY) {
cmStateEnums::ArtifactType type = cmStateEnums::RuntimeBinaryArtifact;
if (target->GetType() == cmStateEnums::SHARED_LIBRARY &&
target->IsDLLPlatform()) {
type = cmStateEnums::ImportLibraryArtifact;
}
linkPath += " " + libPathFlag +
item.Target->GetDirectory(cli.GetConfig(), type) +
libPathTerminator + " ";
}
}
}
for (std::string const& libDir : cli.GetDirectories()) {
linkPath += " " + libPathFlag + this->ConvertToOutputForExisting(libDir) +
libPathTerminator + " ";
}
return linkPath;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment