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

[Bryan Drewery]

Author: bdrewery
Date: Wed Aug 31 19:30:00 2016
New Revision: 305145
URL: https://svnweb.freebsd.org/changeset/base/305145

Log:
  DIRDEPS_BUILD: Avoid cyclic dependency with libc++.
  
  The DIRDEPS_BUILD does not have a 'make includes' phase, so it would
  otherwise want libc++ to be fully built/staged before building
  libgcc.  Using the header directly works.
  
  MFC after:	3 days
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/gnu/lib/libgcc/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Wed Aug 31 18:49:50 2016	(r305144)
+++ head/gnu/lib/libgcc/Makefile	Wed Aug 31 19:30:00 2016	(r305145)
@@ -95,6 +95,10 @@ CXXFLAGS+=	-std=c++11
 .endif
 CXXFLAGS+=	-fno-rtti
 STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
+.if ${MK_DIRDEPS_BUILD} == "yes"
+# Avoid dependency on lib/libc++
+CFLAGS+=	-I${SRCTOP}/contrib/libc++/include
+.endif
 
 .else # MK_LLVM_LIBUNWIND