nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -resource-dir to clang -cc1, this allows the base directory for compiler

Browse Source 
resources (e.g., /usr/lib/clang/1.1) to be passed on the command line instead of
computed.

llvm-svn: 91370
This commit is contained in:
Daniel Dunbar
2009-12-15 00:06:45 +00:00
parent 7dc42e5d4c
commit a5a166d01a
8 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/Frontend/CompilerInvocation.cpp
View File

@@ -409,8 +409,9 @@ static void HeaderSearchOptsToArgs(const HeaderSearchOptions &Opts,
// FIXME: Provide an option for this, and move env detection to driver.
llvm::llvm_report_error("Not yet implemented!");
}
if (!Opts.BuiltinIncludePath.empty()) {
// FIXME: Provide an option for this, and move to driver.
if (!Opts.ResourceDir.empty()) {
Res.push_back("-resource-dir");
Res.push_back(Opts.ResourceDir);
}
if (!Opts.UseStandardIncludes)
Res.push_back("-nostdinc");
@@ -951,8 +952,8 @@ ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args, Diagnostic &Diags) {
return DashX;
}
std::string CompilerInvocation::GetBuiltinIncludePath(const char *Argv0,
void *MainAddr) {
std::string CompilerInvocation::GetResourcesPath(const char *Argv0,
void *MainAddr) {
llvm::sys::Path P = llvm::sys::Path::GetMainExecutable(Argv0, MainAddr);
if (!P.isEmpty()) {
@@ -963,7 +964,6 @@ std::string CompilerInvocation::GetBuiltinIncludePath(const char *Argv0,
P.appendComponent("lib");
P.appendComponent("clang");
P.appendComponent(CLANG_VERSION_STRING);
P.appendComponent("include");
}
return P.str();
@@ -975,10 +975,7 @@ static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args) {
Opts.Verbose = Args.hasArg(OPT_v);
Opts.UseBuiltinIncludes = !Args.hasArg(OPT_nobuiltininc);
Opts.UseStandardIncludes = !Args.hasArg(OPT_nostdinc);
// Filled in by clients.
//
// FIXME: Elimate this.
Opts.BuiltinIncludePath = "";
Opts.ResourceDir = getLastArgValue(Args, OPT_resource_dir);
// Add -I... and -F... options in order.
for (arg_iterator it = Args.filtered_begin(OPT_I, OPT_F),