intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-24 08:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Address some of the concerns by Chandler.

Browse Source 
* s/AddDirectoryList/addDirectoryList/
* Move the call to ::getenv into the function.
* FileCheck-ize the testcase.

llvm-svn: 152583
This commit is contained in:
Bill Wendling
2012-03-12 22:10:06 +00:00
parent 987cef1fe2
commit c0938f3fdb
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
clang/lib/Driver/Tools.cpp
View File

@@ -88,10 +88,11 @@ static void QuoteTarget(StringRef Target,
}
}
static void AddDirectoryList(const ArgList &Args,
static void addDirectoryList(const ArgList &Args,
ArgStringList &CmdArgs,
const char *ArgName,
const char *DirList) {
const char *EnvVar) {
const char *DirList = ::getenv(EnvVar);
if (!DirList)
return; // Nothing to do.
@@ -106,9 +107,9 @@ static void AddDirectoryList(const ArgList &Args,
CmdArgs.push_back(".");
} else {
CmdArgs.push_back(ArgName);
CmdArgs.push_back(Args.MakeArgString(Dirs.substr(0, Delim)));
CmdArgs.push_back(Args.MakeArgString(Dirs.split(Delim).first));
}
Dirs = Dirs.substr(Delim + 1);
Dirs = Dirs.split(Delim).second;
}
if (Dirs.empty()) { // Trailing colon.
@@ -162,7 +163,7 @@ static void AddLinkerInputs(const ToolChain &TC,
}
// LIBRARY_PATH - included following the user specified library paths.
AddDirectoryList(Args, CmdArgs, "-L", ::getenv("LIBRARY_PATH"));
addDirectoryList(Args, CmdArgs, "-L", "LIBRARY_PATH");
}
/// \brief Determine whether Objective-C automated reference counting is
@@ -402,19 +403,15 @@ void Clang::AddPreprocessingOptions(Compilation &C,
// frontend into the driver. It will allow deleting 4 otherwise unused flags.
// CPATH - included following the user specified includes (but prior to
// builtin and standard includes).
AddDirectoryList(Args, CmdArgs, "-I", ::getenv("CPATH"));
addDirectoryList(Args, CmdArgs, "-I", "CPATH");
// C_INCLUDE_PATH - system includes enabled when compiling C.
AddDirectoryList(Args, CmdArgs, "-c-isystem",
::getenv("C_INCLUDE_PATH"));
addDirectoryList(Args, CmdArgs, "-c-isystem", "C_INCLUDE_PATH");
// CPLUS_INCLUDE_PATH - system includes enabled when compiling C++.
AddDirectoryList(Args, CmdArgs, "-cxx-isystem",
::getenv("CPLUS_INCLUDE_PATH"));
addDirectoryList(Args, CmdArgs, "-cxx-isystem", "CPLUS_INCLUDE_PATH");
// OBJC_INCLUDE_PATH - system includes enabled when compiling ObjC.
AddDirectoryList(Args, CmdArgs, "-objc-isystem",
::getenv("OBJC_INCLUDE_PATH"));
addDirectoryList(Args, CmdArgs, "-objc-isystem", "OBJC_INCLUDE_PATH");
// OBJCPLUS_INCLUDE_PATH - system includes enabled when compiling ObjC++.
AddDirectoryList(Args, CmdArgs, "-objcxx-isystem",
::getenv("OBJCPLUS_INCLUDE_PATH"));
addDirectoryList(Args, CmdArgs, "-objcxx-isystem", "OBJCPLUS_INCLUDE_PATH");
// Add C++ include arguments, if needed.
if (types::isCXX(Inputs[0].getType()))

4
clang/test/Driver/linker-opts.c
View File

@@ -1,2 +1,2 @@
// RUN: env LIBRARY_PATH=%T/test1 %clang -x c %s -### -o foo 2> %t.log
// RUN: grep '".*ld.*" .*"-L" "%T/test1"' %t.log
// RUN: env LIBRARY_PATH=%T/test1 %clang -x c %s -### 2>&1 | FileCheck %s
// CHECK: "-L" "{{.*}}/test1"