[llvm-commits] [llvm] r145622 - /llvm/trunk/tools/llvm-config-2/llvm-config.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec  1 14:00:19 2011
New Revision: 145622

URL: http://llvm.org/viewvc/llvm-project?rev=145622&view=rev
Log:
llvm-config-2: Fix --cflags and --includedir which pointed at the wrong
directory when running from a build directory.

Modified:
    llvm/trunk/tools/llvm-config-2/llvm-config.cpp

Modified: llvm/trunk/tools/llvm-config-2/llvm-config.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config-2/llvm-config.cpp?rev=145622&r1=145621&r2=145622&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-config-2/llvm-config.cpp (original)
+++ llvm/trunk/tools/llvm-config-2/llvm-config.cpp Thu Dec  1 14:00:19 2011
@@ -210,16 +210,15 @@
   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";
     }