summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/FrontendActions.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-07-22 16:35:34 +0000
committerDouglas Gregor <dgregor@apple.com>2011-07-22 16:35:34 +0000
commitc567ba26e92030a09c96d0a0562a1795dc8f0b82 (patch)
tree3dd8378bda7ac58c68fc28eddc0ab63ed8c8184d /clang/lib/Frontend/FrontendActions.cpp
parent5814d9d35bf39cad14ced5744710fb299c8c6570 (diff)
downloadbcm5719-llvm-c567ba26e92030a09c96d0a0562a1795dc8f0b82.tar.gz
bcm5719-llvm-c567ba26e92030a09c96d0a0562a1795dc8f0b82.zip
Switch all of the "isysroot" const char*'s throughout the AST reader
and writer to StringRef or std::string, as appropriate. llvm-svn: 135769
Diffstat (limited to 'clang/lib/Frontend/FrontendActions.cpp')
-rw-r--r--clang/lib/Frontend/FrontendActions.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp
index 7b06c7e49ac..342a4c24652 100644
--- a/clang/lib/Frontend/FrontendActions.cpp
+++ b/clang/lib/Frontend/FrontendActions.cpp
@@ -82,9 +82,10 @@ ASTConsumer *GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI,
if (ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, OS, Chaining))
return 0;
- const char *isysroot = CI.getFrontendOpts().RelocatablePCH ?
- Sysroot.c_str() : 0;
- return new PCHGenerator(CI.getPreprocessor(), OutputFile, Chaining, isysroot, OS);
+ if (!CI.getFrontendOpts().RelocatablePCH)
+ Sysroot.clear();
+ return new PCHGenerator(CI.getPreprocessor(), OutputFile, Chaining, Sysroot,
+ OS);
}
bool GeneratePCHAction::ComputeASTConsumerArguments(CompilerInstance &CI,
OpenPOWER on IntegriCloud