Skip to content

Add the remaining toolchain-distributed runtime libs to autolink-extract #64312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
al45tair merged 6 commits into from
Mar 27, 2023
Merged

Add the remaining toolchain-distributed runtime libs to autolink-extract #64312

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b466f31
Add the remaining toolchain-distributed runtime libs to autolink-extr…
gwynne Mar 13, 2023
009ee7e
Address PR feedback
gwynne Mar 13, 2023
207ceae
Workaround for XCTest buildsystem rpath bug
gwynne Mar 13, 2023
32d1a2f
Update autolink_extract_main.cpp
gwynne Mar 13, 2023
f5e5c8c
Okay, let's try actually having an ordering if we're trying to use an…
gwynne Mar 14, 2023
10af912
Whoops. El smarty-pants over here forgot to put XCTest back where it …
gwynne Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions lib/DriverTool/autolink_extract_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,42 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
std::vector<std::string> LinkerFlags;

// Keep track of whether we've already added the common
// Swift libraries that ususally have autolink directives
// in most object fiels
// Swift libraries that usually have autolink directives
// in most object files
std::unordered_map<std::string, bool> SwiftRuntimeLibraries = {
// Common Swift runtime libs
{"-lswiftSwiftOnoneSupport", false},
{"-lswiftCore", false},
{"-lswift_Concurrency", false},
{"-lswift_StringProcessing", false},
{"-lswift_RegexBuilder", false},
{"-lswift_RegexParser", false},
{"-lswift_Backtracing", false},
{"-lswiftGlibc", false},
{"-lBlocksRuntime", false},
// Dispatch-specific Swift runtime libs
{"-ldispatch", false},
{"-lDispatchStubs", false},
{"-lswiftDispatch", false},
// CoreFoundation and Foundation Swift runtime libs
{"-lCoreFoundation", false},
{"-lFoundation", false},
{"-lFoundationNetworking", false},
{"-lFoundationXML", false},
// Foundation support libs
{"-lcurl", false},
{"-lxml2", false},
{"-luuid", false},
// ICU Swift runtime libs
{"-licui18nswift", false},
{"-licuucswift", false},
{"-licudataswift", false},
// Common-use ordering-agnostic Linux system libs
{"-lm", false},
{"-lpthread", false},
{"-lutil", false},
{"-ldl", false},
{"-lz", false},
};

// Extract the linker flags from the objects.
Expand Down