From aab5fee0721846740415f201b41c920033a49303 Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sun, 13 Oct 2013 00:29:14 +0000
Subject: [PATCH] We need an extra -I from lib/msun and we need to supress
 dependency on it - cyclic.

---
 lib/libc/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index ba4dd0ae16c..39d820264e3 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -158,7 +158,15 @@ CFLAGS+= -I${.CURDIR:H}/libutil
 # Same issue with libm
 MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${.CURDIR:H}/msun -V ARCH_SUBDIR
 # unfortunately msun/src contains both private and public headers
-CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} -I${.CURDIR:H}/msun/src
+CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} 
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+= -I${.CURDIR:H}/msun/x86
+.endif
+CFLAGS+= -I${.CURDIR:H}/msun/src
+# and we do not want to record a dependency on msun
+.if ${.MAKE.LEVEL} > 0
+GENDIRDEPS_FILTER+= N${RELDIR:H}/msun
+.endif
 .endif
 
 # Disable warnings in contributed sources.