[clang] aeaa09e - Revert "[AVR] Remove duplicate specification of lib directory"

[Dylan McKay via cfe-commits]

Author: Dylan McKay
Date: 2020-06-19T17:37:15+12:00
New Revision: aeaa09ec10ee41ef2469f4d69320d386d492bf23

URL: https://github.com/llvm/llvm-project/commit/aeaa09ec10ee41ef2469f4d69320d386d492bf23
DIFF: https://github.com/llvm/llvm-project/commit/aeaa09ec10ee41ef2469f4d69320d386d492bf23.diff

LOG: Revert "[AVR] Remove duplicate specification of lib directory"

This reverts commit 03b0831144a9fe25aac81498b0a1dec82f4ec5df.

I forgot to attribute the commit originally so I am recommitting in a
subsequent patch.

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/AVR.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/AVR.cpp b/clang/lib/Driver/ToolChains/AVR.cpp
index a86d6fa9f357..04655d5b1885 100644
--- a/clang/lib/Driver/ToolChains/AVR.cpp
+++ b/clang/lib/Driver/ToolChains/AVR.cpp
@@ -77,6 +77,8 @@ AVRToolChain::AVRToolChain(const Driver &D, const llvm::Triple &Triple,
         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("/") +