summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2018-02-22 09:42:10 +0000
committerJonas Devlieghere <jonas@devlieghere.com>2018-02-22 09:42:10 +0000
commitd47268ecc2190c3c096716e4f27d4db7bea1fef0 (patch)
tree90e2bbe1bacc9218506c29c7aa81989749c97318
parent01e0f25a9f950edc1c3324100e7143b07bef12a0 (diff)
downloadbcm5719-llvm-d47268ecc2190c3c096716e4f27d4db7bea1fef0.tar.gz
bcm5719-llvm-d47268ecc2190c3c096716e4f27d4db7bea1fef0.zip
[dsymutil] Replace PATH_MAX in SmallString with fixed value.
Apparently the Windows bots don't know this define, so just going with a sensible default. Failing builds: http://lab.llvm.org:8011/builders/lldb-x86-windows-msvc2015/builds/19179 http://lab.llvm.org:8011/builders/lld-x86_64-win7/builds/19263 llvm-svn: 325762
-rw-r--r--llvm/tools/dsymutil/DwarfLinker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp
index 05c933e0746..2d89e6b2e90 100644
--- a/llvm/tools/dsymutil/DwarfLinker.cpp
+++ b/llvm/tools/dsymutil/DwarfLinker.cpp
@@ -110,18 +110,18 @@ public:
/// StringRef is interned in the given \p StringPool.
StringRef resolve(std::string Path, NonRelocatableStringpool &StringPool) {
StringRef FileName = sys::path::filename(Path);
- SmallString<PATH_MAX> ParentPath = sys::path::parent_path(Path);
+ SmallString<256> ParentPath = sys::path::parent_path(Path);
// If the ParentPath has not yet been resolved, resolve and cache it for
// future look-ups.
if (!ResolvedPaths.count(ParentPath)) {
- SmallString<PATH_MAX> RealPath;
+ SmallString<256> RealPath;
sys::fs::real_path(ParentPath, RealPath);
ResolvedPaths.insert({ParentPath, StringRef(RealPath).str()});
}
// Join the file name again with the resolved path.
- SmallString<PATH_MAX> ResolvedPath(ResolvedPaths[ParentPath]);
+ SmallString<256> ResolvedPath(ResolvedPaths[ParentPath]);
sys::path::append(ResolvedPath, FileName);
return StringPool.internString(ResolvedPath);
}
OpenPOWER on IntegriCloud