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 a9421c6..175513a 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -454,8 +454,8 @@
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)