From: Daniel Dunbar <daniel@zuster.org>
Date: Thu, 1 Dec 2011 20:00:19 +0000 (+0000)
Subject: llvm-config-2: Fix --cflags and --includedir which pointed at the wrong
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b3821996efeae84408133c92c28756c46f101658;p=oota-llvm.git

llvm-config-2: Fix --cflags and --includedir which pointed at the wrong
directory when running from a build directory.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145622 91177308-0d34-0410-b5e6-96231b3b80d8
---

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