From e98ddfce7edbcdcce0e60d4162da1306228c3f4a Mon Sep 17 00:00:00 2001 From: Brian Gaeke Date: Tue, 30 Sep 2003 14:03:48 +0000 Subject: [PATCH] 1. Use better error messages in LinkFiles(). 2. I think the caller of LinkFiles() should not ignore a true return value. (If you have a good reason why it ought to, feel free to revert this. It's just something that's been bugging me for a while.) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8760 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkArchives.cpp | 4 ++-- tools/gccld/Linker.cpp | 4 ++-- tools/gccld/gccld.cpp | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp index 0d0dc9fabaa..34fe2f12456 100644 --- a/lib/Linker/LinkArchives.cpp +++ b/lib/Linker/LinkArchives.cpp @@ -401,13 +401,13 @@ bool LinkFiles(const char *progname, Pathname = Files[i]; } else { if (SearchPath == NULL) { - std::cerr << "Cannot find " << Files[i]; + std::cerr << "Cannot find linker input file '" << Files[i] << "'"; return true; } Pathname = std::string(SearchPath)+"/"+Files[i]; if (!FileExists(Pathname)) { - std::cerr << "Cannot find " << Files[i]; + std::cerr << "Cannot find linker input file '" << Files[i] << "'"; return true; } } diff --git a/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp index 0d0dc9fabaa..34fe2f12456 100644 --- a/tools/gccld/Linker.cpp +++ b/tools/gccld/Linker.cpp @@ -401,13 +401,13 @@ bool LinkFiles(const char *progname, Pathname = Files[i]; } else { if (SearchPath == NULL) { - std::cerr << "Cannot find " << Files[i]; + std::cerr << "Cannot find linker input file '" << Files[i] << "'"; return true; } Pathname = std::string(SearchPath)+"/"+Files[i]; if (!FileExists(Pathname)) { - std::cerr << "Cannot find " << Files[i]; + std::cerr << "Cannot find linker input file '" << Files[i] << "'"; return true; } } diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp index 8b9dfd1123a..b991cd57ea0 100644 --- a/tools/gccld/gccld.cpp +++ b/tools/gccld/gccld.cpp @@ -256,7 +256,8 @@ main(int argc, char **argv, char ** envp) Libraries.end()); // Link in all of the files - LinkFiles(argv[0], Composite.get(), InputFilenames, Verbose); + if (LinkFiles(argv[0], Composite.get(), InputFilenames, Verbose)) + return 1; // Error already printed LinkLibraries(argv[0], Composite.get(), Libraries, LibPaths, Verbose, Native); // Link in all of the libraries next... -- 2.11.0