From: Duncan Sands <baldrick@free.fr>
Date: Mon, 28 Jan 2008 17:38:30 +0000 (+0000)
Subject: Unbreak builds with differing object and source
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=095765e26d1316e00f2fe65ca1bd4c71e1fc02bd;p=oota-llvm.git

Unbreak builds with differing object and source
directories.  Patch by Sam Bishop.


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

diff --git a/Makefile.rules b/Makefile.rules
index a9421c6e13e..175513a4f60 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -454,8 +454,8 @@ endif
 LD.Flags      += -L$(LibDir) -L$(LLVMLibDir) 
 CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
 # All -I flags should go here, so that they don't confuse llvm-config.
-CPP.Flags     += $(patsubst %,-I%/include,$(sort \
-	         $(PROJ_OBJ_DIR) $(PROJ_SRC_DIR) \
+CPP.Flags     += $(sort -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \
+	         $(patsubst %,-I%/include,\
 	         $(PROJ_OBJ_ROOT) $(PROJ_SRC_ROOT) \
 	         $(LLVM_OBJ_ROOT) $(LLVM_SRC_ROOT))) \
 	         $(CPP.BaseFlags)