diff options
Diffstat (limited to 'clang/lib/Driver/ToolChains/Clang.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index cc20aad..aaab97d 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -7592,9 +7592,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // Set the default fexec-charset as the system charset. CmdArgs.push_back("-fexec-charset"); - CmdArgs.push_back(Args.MakeArgString(Triple.getSystemCharset())); - if (Arg *execCharset = Args.getLastArg(options::OPT_fexec_charset_EQ)) { - StringRef value = execCharset->getValue(); + CmdArgs.push_back(Args.MakeArgString(Triple.getDefaultTextEncoding())); + if (Arg *execEncoding = Args.getLastArg(options::OPT_fexec_charset_EQ)) { + StringRef value = execEncoding->getValue(); llvm::ErrorOr<llvm::TextEncodingConverter> ErrorOrConverter = llvm::TextEncodingConverter::create("UTF-8", value.data()); if (ErrorOrConverter) { @@ -7602,7 +7602,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(value)); } else { D.Diag(diag::err_drv_invalid_value) - << execCharset->getAsString(Args) << value; + << execEncoding->getAsString(Args) << value; } } |