From ccb2e383f600082671d406147d505c99aae56811 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Tue, 3 Jan 2017 22:46:00 +0000
Subject: [PATCH] MFC r305145:

  DIRDEPS_BUILD: Avoid cyclic dependency with libc++.
---
 gnu/lib/libgcc/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 64baf1b0021..0a53d2e8ced 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -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
 
-- 
2.45.0