summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex
diff options
context:
space:
mode:
authorNikola Smiljanic <popizdeh@gmail.com>2015-05-08 03:26:15 +0000
committerNikola Smiljanic <popizdeh@gmail.com>2015-05-08 03:26:15 +0000
commit1cf6c28a9c0c507a224889263a20df42fd791cb9 (patch)
tree15800e96dd4326ce0d3cc849f2fffa3590957469 /clang/lib/Lex
parentcd819147720604efd96084190c38ea7aed9881c8 (diff)
downloadbcm5719-llvm-1cf6c28a9c0c507a224889263a20df42fd791cb9.tar.gz
bcm5719-llvm-1cf6c28a9c0c507a224889263a20df42fd791cb9.zip
Fix path separator issue on Windows.
llvm-svn: 236804
Diffstat (limited to 'clang/lib/Lex')
-rw-r--r--clang/lib/Lex/HeaderSearch.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp
index 04cdb0f69f7..b316ccae652 100644
--- a/clang/lib/Lex/HeaderSearch.cpp
+++ b/clang/lib/Lex/HeaderSearch.cpp
@@ -614,10 +614,8 @@ const FileEntry *HeaderSearch::LookupFile(
const FileEntry *Includer = IncluderAndDir.first;
// Concatenate the requested file onto the directory.
- // FIXME: Portability. Filename concatenation should be in sys::Path.
TmpDir = IncluderAndDir.second->getName();
- TmpDir.push_back('/');
- TmpDir.append(Filename.begin(), Filename.end());
+ llvm::sys::path::append(TmpDir, Filename);
// FIXME: We don't cache the result of getFileInfo across the call to
// getFileAndSuggestModule, because it's a reference to an element of
OpenPOWER on IntegriCloud