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
This commit is contained in:
Brian Gaeke 2003-09-30 14:03:48 +00:00
parent f5b55656c0
commit e98ddfce7e
3 changed files with 6 additions and 5 deletions

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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...