[clang] fad99d3 - [clang][Driver] Fix a spot in commit 169f60f7c76cb6f7d234ab5dfb2b5e367a35ccbb

Ben Shi via cfe-commits cfe-commits at lists.llvm.org
Sun Oct 15 00:33:55 PDT 2023


Author: Ben Shi
Date: 2023-10-15T15:29:14+08:00
New Revision: fad99d398a714f2fed18e2e65aef47a9b273f2f7

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

LOG: [clang][Driver] Fix a spot in commit 169f60f7c76cb6f7d234ab5dfb2b5e367a35ccbb

My previous commit leads to a failure in 'Builders/ppc64le-lld-multistage-test',
as shown at "https://lab.llvm.org/buildbot/#/builders/36/builds/38790".

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 2e46b25aeba75ef..27505b9462c4492 100644
--- a/clang/lib/Driver/ToolChains/AVR.cpp
+++ b/clang/lib/Driver/ToolChains/AVR.cpp
@@ -556,7 +556,7 @@ void AVR::Linker::ConstructJob(Compilation &C, const JobAction &JA,
 
     // Add avr-libc's linker script to lld by default, if it exists.
     if (!Args.hasArg(options::OPT_T) &&
-        Linker.find("lld") != std::string::npos) {
+        Linker.find("avr-ld") == std::string::npos) {
       std::string Path(*AVRLibcRoot + "/lib/ldscripts/");
       Path += *FamilyName;
       Path += ".x";


        


More information about the cfe-commits mailing list