From 1ff70c7190a3dff47eb299c82f9d88e6cbba959c Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 21 Oct 2014 20:07:15 +0000
Subject: [PATCH] Make the external toolchain support grows to the knowleged of
 XXFLAGS for C++ dedicated flags and DEPFLAGS for mkdep flags Pass the path to
 the libc++ headers in both, enforce the gnu++11 standard in the XXFLAGS to
 satisfy libc++ requirements pass the libc++ objectdir as a location where to
 find libraries so it can find libstdc++.so and libstdc++.A

Reviewed by:	imp
---
 Makefile.inc1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 88749723876..7899d9dea58 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -323,7 +323,8 @@ X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
 X${BINUTIL}?=	${${BINUTIL}}
 .endif
 .endfor
-WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
+WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS} ${XXFLAGS}" \
+		DEPFLAGS="${DEPFLAGS}" \
 		CPP="${XCPP} ${XFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
 		OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
@@ -351,6 +352,8 @@ TARGET_ABI=	gnueabi
 .endif
 .if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
 XFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+XXFLAGS+=	-I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11 -L${WORLDTMP}/../lib/libc++
+DEPFLAGS+=	-I${WORLDTMP}/usr/include/c++/v1
 .else
 TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0