From dd04df0ec33a903ee7fc747701bafde622f77d8b Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 7 Jul 2005 23:21:43 +0000 Subject: For PR495: Get rid of the difference between file paths and directory paths. The Path class now simply stores a path that can refer to either a file or a directory. This required various changes in the implementation and interface of the class with the corresponding impact to its users. Doxygen comments were also updated to reflect these changes. Interface changes are: appendDirectory -> appendComponent appendFile -> appendComponent elideDirectory -> eraseComponent elideFile -> eraseComponent elideSuffix -> eraseSuffix renameFile -> rename setDirectory -> set setFile -> set Changes pass Dejagnu and llvm-test/SingleSource tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22349 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/gccld/GenerateCode.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'tools/gccld/GenerateCode.cpp') diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp index 020d883a6b..f6a08ce8cb 100644 --- a/tools/gccld/GenerateCode.cpp +++ b/tools/gccld/GenerateCode.cpp @@ -152,15 +152,11 @@ static bool isBytecodeLibrary(const sys::Path &FullPath) { static bool isBytecodeLPath(const std::string &LibPath) { bool isBytecodeLPath = false; - // Make sure the -L path has a '/' character - // because llvm-g++ passes them without the ending - // '/' char and sys::Path doesn't think it is a - // directory (see: sys::Path::isDirectory) without it - std::string dir = LibPath; - if ( dir[dir.length()-1] != '/' ) - dir.append("/"); - - sys::Path LPath(dir); + sys::Path LPath(LibPath); + + // Make sure its a directory + if (!LPath.isDirectory()) + return isBytecodeLPath; // Grab the contents of the -L path std::set Files; -- cgit v1.2.3-18-g5258