[llvm-commits] [llvm-gcc-4.2] r50629 - /llvm-gcc-4.2/trunk/gcc/Makefile.in

[Anton Korobeynikov]

Author: asl
Date: Sun May  4 16:21:54 2008
New Revision: 50629

URL: http://llvm.org/viewvc/llvm-project?rev=50629&view=rev
Log:
Pull LLVM objdir before srcdir into includes. This fixes PR2282, when old
Intrinsics.gen was pulled from srcdir, instead of new from objdir.

Modified:
    llvm-gcc-4.2/trunk/gcc/Makefile.in

Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=50629&r1=50628&r2=50629&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/Makefile.in Sun May  4 16:21:54 2008
@@ -935,13 +935,13 @@
 
 # LLVM LOCAL begin
 ifneq ($(LLVMOBJDIR),)
-INCLUDES += -I$(LLVMSRCDIR)/include
-
 # If LLVM is built srcdir != objdir, include the objdir headers for configured
 # headers, like DataTypes.h.
 ifneq (($LLVMOBJDIR),$(LLVMSRCDIR))
 INCLUDES += -I$(LLVMOBJDIR)/include
 endif
+
+INCLUDES += -I$(LLVMSRCDIR)/include
 endif
 # LLVM LOCAL end
 .c.o: