From 5df2c3ccc4cc9ccb0fdb584e38f4943ef9ca6e53 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 25 Mar 2016 22:36:23 +0000
Subject: [PATCH] External compiler: Remove redundant flags from CXXFLAGS.

The use of XCXXFLAGS is to assign it to CXX in CROSSENV.
XCFLAGS is also assigned here so there is no need to have
--syroot and -B flags again.

Sponsored by:	EMC / Isilon Storage Division
---
 Makefile.inc1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 2e39d6cc3a66..34ba23aa8d66 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -448,12 +448,10 @@ TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP} ${BFLAGS}
-XCXXFLAGS+=	--sysroot=${WORLDTMP} ${BFLAGS}
 .else
 .if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX})
 BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 XCFLAGS+=	${BFLAGS}
-XCXXFLAGS+=	${BFLAGS}
 .endif
 .endif # ${XCC:M/*} || ${MK_CROSS_COMPILER} == "no"