maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

llvm-config-2: Fix --cflags and --includedir which pointed at the wrong 

directory when running from a build directory.

llvm-svn: 145622
This commit is contained in:
Daniel Dunbar 2011-12-01 20:00:19 +00:00
parent f60485c4cf
commit 5a78bb5686
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/tools/llvm-config-2/llvm-config.cpp
View File

@ -210,16 +210,15 @@ int main(int argc, char **argv) {
std::string ActivePrefix, ActiveBinDir, ActiveIncludeDir, ActiveLibDir; std::string ActivePrefix, ActiveBinDir, ActiveIncludeDir, ActiveLibDir;
std::string ActiveIncludeOption; std::string ActiveIncludeOption;
if (IsInDevelopmentTree) { if (IsInDevelopmentTree) {
ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include";
ActivePrefix = CurrentExecPrefix; ActivePrefix = CurrentExecPrefix;
// CMake organizes the products differently than a normal prefix style // CMake organizes the products differently than a normal prefix style
// layout. // layout.
if (DevelopmentTreeLayoutIsCMakeStyle) { if (DevelopmentTreeLayoutIsCMakeStyle) {
ActiveIncludeDir = ActiveObjRoot + "/include";
ActiveBinDir = ActiveObjRoot + "/bin/" + LLVM_BUILDMODE; ActiveBinDir = ActiveObjRoot + "/bin/" + LLVM_BUILDMODE;
ActiveLibDir = ActiveObjRoot + "/lib/" + LLVM_BUILDMODE; ActiveLibDir = ActiveObjRoot + "/lib/" + LLVM_BUILDMODE;
} else { } else {
ActiveIncludeDir = ActiveObjRoot + "/include";
ActiveBinDir = ActiveObjRoot + "/" + LLVM_BUILDMODE + "/bin"; ActiveBinDir = ActiveObjRoot + "/" + LLVM_BUILDMODE + "/bin";
ActiveLibDir = ActiveObjRoot + "/" + LLVM_BUILDMODE + "/lib"; ActiveLibDir = ActiveObjRoot + "/" + LLVM_BUILDMODE + "/lib";
} }