mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-09-27 00:21:03 +00:00
For PR495:
Change interface to Path class: readable -> canRead writable -> canWrite executable -> canExecute More (incremental) changes coming to close 495. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22345 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -187,7 +187,7 @@ private:
|
||||
|
||||
void cleanup() {
|
||||
if (!isSet(KEEP_TEMPS_FLAG)) {
|
||||
if (TempDir.isDirectory() && TempDir.writable())
|
||||
if (TempDir.isDirectory() && TempDir.canWrite())
|
||||
TempDir.destroyDirectory(/*remove_contents=*/true);
|
||||
} else {
|
||||
std::cout << "Temporary files are in " << TempDir << "\n";
|
||||
@@ -415,7 +415,7 @@ private:
|
||||
if (progpath.isEmpty())
|
||||
throw std::string("Can't find program '" +
|
||||
action->program.toString()+"'");
|
||||
else if (progpath.executable())
|
||||
else if (progpath.canExecute())
|
||||
action->program = progpath;
|
||||
else
|
||||
throw std::string("Program '"+action->program.toString()+
|
||||
@@ -449,32 +449,32 @@ private:
|
||||
bool native = false) {
|
||||
sys::Path fullpath;
|
||||
fullpath.setFile(link_item);
|
||||
if (fullpath.readable())
|
||||
if (fullpath.canRead())
|
||||
return fullpath;
|
||||
for (PathVector::iterator PI = LibraryPaths.begin(),
|
||||
PE = LibraryPaths.end(); PI != PE; ++PI) {
|
||||
fullpath.setDirectory(PI->toString());
|
||||
fullpath.appendFile(link_item);
|
||||
if (fullpath.readable())
|
||||
if (fullpath.canRead())
|
||||
return fullpath;
|
||||
if (native) {
|
||||
fullpath.appendSuffix("a");
|
||||
} else {
|
||||
fullpath.appendSuffix("bc");
|
||||
if (fullpath.readable())
|
||||
if (fullpath.canRead())
|
||||
return fullpath;
|
||||
fullpath.elideSuffix();
|
||||
fullpath.appendSuffix("o");
|
||||
if (fullpath.readable())
|
||||
if (fullpath.canRead())
|
||||
return fullpath;
|
||||
fullpath = *PI;
|
||||
fullpath.appendFile(std::string("lib") + link_item);
|
||||
fullpath.appendSuffix("a");
|
||||
if (fullpath.readable())
|
||||
if (fullpath.canRead())
|
||||
return fullpath;
|
||||
fullpath.elideSuffix();
|
||||
fullpath.appendSuffix("so");
|
||||
if (fullpath.readable())
|
||||
if (fullpath.canRead())
|
||||
return fullpath;
|
||||
}
|
||||
}
|
||||
@@ -494,7 +494,7 @@ private:
|
||||
// First, see if the unadorned file name is not readable. If so,
|
||||
// we must track down the file in the lib search path.
|
||||
sys::Path fullpath;
|
||||
if (!link_item.readable()) {
|
||||
if (!link_item.canRead()) {
|
||||
// look for the library using the -L arguments specified
|
||||
// on the command line.
|
||||
fullpath = GetPathForLinkageItem(link_item.toString());
|
||||
|
Reference in New Issue
Block a user