diff options
Diffstat (limited to 'clang/lib/Driver/ToolChains/AVR.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains/AVR.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/clang/lib/Driver/ToolChains/AVR.cpp b/clang/lib/Driver/ToolChains/AVR.cpp index e8a3a7b38c31..092bade53c63 100644 --- a/clang/lib/Driver/ToolChains/AVR.cpp +++ b/clang/lib/Driver/ToolChains/AVR.cpp @@ -74,13 +74,11 @@ AVRToolChain::AVRToolChain(const Driver &D, const llvm::Triple &Triple, // No avr-libc found and so no runtime linked. D.Diag(diag::warn_drv_avr_libc_not_found); } else { // We have enough information to link stdlibs - std::string GCCRoot = GCCInstallation.getInstallPath(); + std::string GCCRoot = std::string(GCCInstallation.getInstallPath()); std::string LibcRoot = AVRLibcRoot.getValue(); getFilePaths().push_back(LibcRoot + std::string("/lib/") + std::string(*FamilyName)); - getFilePaths().push_back(LibcRoot + std::string("/lib/") + - std::string(*FamilyName)); getFilePaths().push_back(GCCRoot + std::string("/") + std::string(*FamilyName)); @@ -144,8 +142,9 @@ void AVR::Linker::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(std::string("-m") + *FamilyName)); } - C.addCommand(std::make_unique<Command>(JA, *this, Args.MakeArgString(Linker), - CmdArgs, Inputs)); + C.addCommand( + std::make_unique<Command>(JA, *this, ResponseFileSupport::AtFileCurCP(), + Args.MakeArgString(Linker), CmdArgs, Inputs)); } llvm::Optional<std::string> AVRToolChain::findAVRLibcInstallation() const { |