diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2012-03-19 15:00:03 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2012-03-19 15:00:03 +0000 |
| commit | 8935578528f6ba085064f6570784d544501e5737 (patch) | |
| tree | 68764503b74536b95abe214bd83ec9e0fd44ef64 /clang/lib/Driver/Tools.cpp | |
| parent | 48ccc4df0bc3c4892bb292ba9d0ae2f09d4a7b3d (diff) | |
| download | bcm5719-llvm-8935578528f6ba085064f6570784d544501e5737.tar.gz bcm5719-llvm-8935578528f6ba085064f6570784d544501e5737.zip | |
Fix a regression where ':' in CPLUS_INCLUDE_PATH and friends would no longer separate paths.
This regressed in r152583. Also add a test to make sure it doesn't regress again.
llvm-svn: 153034
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 52ba4899fa5..c38767d432d 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -107,9 +107,9 @@ static void addDirectoryList(const ArgList &Args, CmdArgs.push_back("."); } else { CmdArgs.push_back(ArgName); - CmdArgs.push_back(Args.MakeArgString(Dirs.split(Delim).first)); + CmdArgs.push_back(Args.MakeArgString(Dirs.substr(0, Delim))); } - Dirs = Dirs.split(Delim).second; + Dirs = Dirs.substr(Delim + 1); } if (Dirs.empty()) { // Trailing colon. |
