From 5a78bb5686ce212fbf3c70d99da1444b6a6861ce Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Thu, 1 Dec 2011 20:00:19 +0000
Subject: [PATCH] llvm-config-2: Fix --cflags and --includedir which pointed at
 the wrong directory when running from a build directory.

llvm-svn: 145622
---
 llvm/tools/llvm-config-2/llvm-config.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/llvm/tools/llvm-config-2/llvm-config.cpp b/llvm/tools/llvm-config-2/llvm-config.cpp
index fddd481230b5..bf3357e9f2f2 100644
--- a/llvm/tools/llvm-config-2/llvm-config.cpp
+++ b/llvm/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";
     }