summaryrefslogtreecommitdiffstats
path: root/lib/Driver/ToolChains.cpp
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-02-19 20:57:58 +0000
committerdim <dim@FreeBSD.org>2015-02-19 20:57:58 +0000
commitdfd258880cb7da4868d2b1a3679779bc4ece5314 (patch)
treeb0d1eaed14959a7722ff246ffa303348922e9fb5 /lib/Driver/ToolChains.cpp
parentff28d95d1f024411955913aaa68c17f2b09c46fd (diff)
downloadFreeBSD-src-dfd258880cb7da4868d2b1a3679779bc4ece5314.zip
FreeBSD-src-dfd258880cb7da4868d2b1a3679779bc4ece5314.tar.gz
Vendor import of clang RELEASE_360/rc4 tag r229772 (effectively, 3.6.0 RC4):
https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc4@229772
Diffstat (limited to 'lib/Driver/ToolChains.cpp')
-rw-r--r--lib/Driver/ToolChains.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 4d97ab3..f789fd5 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -3154,7 +3154,8 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
SmallVector<StringRef, 5> dirs;
CIncludeDirs.split(dirs, ":");
for (StringRef dir : dirs) {
- StringRef Prefix = llvm::sys::path::is_absolute(dir) ? SysRoot : "";
+ StringRef Prefix =
+ llvm::sys::path::is_absolute(dir) ? StringRef(SysRoot) : "";
addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir);
}
return;
OpenPOWER on IntegriCloud