Skip to content

[5.5] Enable swift-driver forwarding on non-Apple platforms. #37385

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
merged 1 commit into from
May 13, 2021
Merged

[5.5] Enable swift-driver forwarding on non-Apple platforms. #37385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions tools/driver/driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,18 @@ static bool appendSwiftDriverName(SmallString<256> &buffer) {
llvm::sys::path::append(buffer, *driverNameOp);
return true;
}
#ifdef __APPLE__
// FIXME: use swift-driver as the default driver for all platforms.

llvm::sys::path::append(buffer, "swift-driver");
if (llvm::sys::fs::exists(buffer)) {
return true;
}
llvm::sys::path::remove_filename(buffer);
llvm::sys::path::append(buffer, "swift-driver-new");
return true;
#else
if (llvm::sys::fs::exists(buffer)) {
return true;
}

return false;
#endif
}

static int run_driver(StringRef ExecName,
Expand Down