From a4b1b44df2e483e2cac51b7330f0f507482e0b69 Mon Sep 17 00:00:00 2001
From: Richard PALO <richard@NetBSD.org>
Date: Sat, 1 Nov 2014 19:23:45 +0100
Subject: [PATCH] update include directories for clang++

---
 lang/clang/Makefile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index b098e47..d2e0b43 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -55,6 +55,14 @@ TEST_ILLUMOS_3849!=\
 	else ${ECHO} 0;	\
 	fi
 
+# The c++ include and c++ architecture include subdirectories are lazily
+# absconded from gcc!
+.if defined(GCCBASE) && !empty(GCCBASE)
+CXXARCHINCLUDE!=	find ${GCCBASE}/include -type d -name '*solaris2.11'
+.else
+CXXARCHINCLUDE!=	find ${_GCC_PREFIX}include -type d -name '*solaris2.11'
+.endif
+
 #doesn't seem to be needed anymore, but may be dependent on
 #a recent version of solaris (illumos) ld.
 #
@@ -64,6 +72,7 @@ SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute gcc paths for SunOS.
 SUBST_FILES.fix-paths=		tools/clang/lib/Driver/Tools.cpp
+SUBST_FILES.fix-paths+=		tools/clang/lib/Frontend/InitHeaderSearch.cpp
 .  if defined(_GCC_ARCHDIR)
 SUBST_SED.fix-paths=		-e 's,/usr/gcc/4.5/lib/gcc/,${_GCC_ARCHDIR}/,g'
 .  else
@@ -83,6 +92,10 @@ SUBST_SED.fix-paths+=		-e 's,getToolChain().GetProgramPath("ld"),"/usr/ccs/bin/l
 .  if ${TEST_ILLUMOS_3849}
 SUBST_SED.fix-paths+=		-e 's,^.*cxa_finalize.*$$,		; //cxa_finalize.o,g'
 .  endif
+SUBST_SED.fix-paths+=		-e 's,/usr/gcc/4.5/include/c++/4.5.2/,${CXXARCHINCLUDE:H},g'
+SUBST_SED.fix-paths+=		-e 's,i386-pc-solaris2.11,${CXXARCHINCLUDE:T},g'
+SUBST_SED.fix-paths+=		-e 's,// Solaris - Fall though..,break;,g'
+SUBST_SED.fix-paths+=		-e 's,/usr/local/include,${PREFIX}/include,g'
 .endif
 
 .include "options.mk"
-- 
2.1.2