Skip to content
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.

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

Adapt to Windows-specific LLVM 12 API change #3697

Merged
merged 1 commit into from
Apr 17, 2021
Merged
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions driver/args.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,17 @@ struct ResponseFile {
return true; // nothing to do

#if defined(_WIN32) && LDC_LLVM_VER >= 700
#if LDC_LLVM_VER >= 1200
const llvm::ErrorOr<std::wstring> wcontent =
llvm::sys::flattenWindowsCommandLine(toRefsVector(args));

std::string content;
if (!wcontent || !llvm::convertWideToUTF8(*wcontent, content))
return false;
#else
const std::string content =
llvm::sys::flattenWindowsCommandLine(toRefsVector(args));
#endif
#else
std::string content;
content.reserve(65536);
Expand Down