svn commit: r307689 - head/gnu/lib/libgcc

[Baptiste Daroussin]

Author: bapt
Date: Thu Oct 20 21:12:50 2016
New Revision: 307689
URL: https://svnweb.freebsd.org/changeset/base/307689

Log:
  Fix building of llvm's unwind if gcc has been also built
  
  when building gcc an unwind.h header is generate in the cc_tool directory
  which is included in the CFLAGS before the path where the llvm's unwind.h file
  lives
  
  Reviewed by:	emaste
  MFC after:	3 days
  Differential Revision:	https://reviews.freebsd.org/D7357

Modified:
  head/gnu/lib/libgcc/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Thu Oct 20 20:29:54 2016	(r307688)
+++ head/gnu/lib/libgcc/Makefile	Thu Oct 20 21:12:50 2016	(r307689)
@@ -30,8 +30,7 @@ CFLAGS+=	-DTARGET_ARM_EABI
 CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
 		-DHAVE_GTHR_DEFAULT \
 		-I${GCCLIB}/include \
-		-I${GCCDIR}/config -I${GCCDIR} -I. \
-		-I${CCDIR}/cc_tools
+		-I${GCCDIR}/config -I${GCCDIR} -I.
 
 LDFLAGS+=	-nodefaultlibs
 LIBADD+=	c
@@ -102,6 +101,12 @@ CFLAGS+=	-I${SRCTOP}/contrib/libc++/incl
 
 .else # MK_LLVM_LIBUNWIND
 
+#
+# Prevent the potential unwind.h from gcc (generated)
+# to be in the include path before the one from llvm unwind
+#
+CFLAGS+=	-I${CCDIR}/cc_tools
+
 .if ${TARGET_CPUARCH} == "arm"
 LIB2ADDEH =	unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c
 .else