646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
Patch paths to use the separate 'lib' output. One of the things this patch
|
|
fixes is the output of `swift -frontend -print-target-info`, which swiftpm uses
|
|
to set rpath on Linux.
|
|
|
|
The check if the executable path starts with 'out' is necessary for
|
|
bootstrapping, or the compiler will fail when run from the build directory.
|
|
|
|
--- a/lib/Frontend/CompilerInvocation.cpp
|
|
+++ b/lib/Frontend/CompilerInvocation.cpp
|
|
@@ -49,11 +49,16 @@ swift::CompilerInvocation::CompilerInvocation() {
|
|
void CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
|
|
StringRef mainExecutablePath, bool shared,
|
|
llvm::SmallVectorImpl<char> &runtimeResourcePath) {
|
|
+ if (mainExecutablePath.startswith("@storeDir@")) {
|
|
+ auto libPath = StringRef("@lib@");
|
|
+ runtimeResourcePath.append(libPath.begin(), libPath.end());
|
|
+ } else {
|
|
runtimeResourcePath.append(mainExecutablePath.begin(),
|
|
mainExecutablePath.end());
|
|
|
|
llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /swift
|
|
llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /bin
|
|
+ }
|
|
appendSwiftLibDir(runtimeResourcePath, shared);
|
|
}
|
|
|