From 433ab98027032d88b093d5b800e6eb04798dbde7 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 23 Sep 2016 14:29:49 -0700
Subject: [PATCH] config/path: remove $TOOLCHAIN_LANGUAGES and $TOOLCHAIN_CXX

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/functions             | 7 -------
 config/options               | 3 ---
 config/path                  | 3 ---
 packages/lang/gcc/package.mk | 2 +-
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/config/functions b/config/functions
index a8ec026efe..5ba8e8cd37 100644
--- a/config/functions
+++ b/config/functions
@@ -131,13 +131,6 @@ require_eglibc() {
   fi
 }
 
-require_cxx() {
-  if [ "$TOOLCHAIN_CXX" != yes ]; then
-    echo "$1 requires C++ toolchain support, aborting."
-    exit 1
-  fi
-}
-
 add_user() {
   # Usage: add_user "username" "password" "userid" "groupid" "description" "home" "shell"
   mkdir -p ${INSTALL}/etc
diff --git a/config/options b/config/options
index 5be882292b..2d86042a94 100644
--- a/config/options
+++ b/config/options
@@ -62,9 +62,6 @@ fi
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
   LOCAL_CXX=`which g++`
 
-# Support C++ in toolchain
-  TOOLCHAIN_CXX="yes"
-
 # verbose compilation mode (yes/no)
   VERBOSE="yes"
 
diff --git a/config/path b/config/path
index ba85b70a76..e4f68ec081 100644
--- a/config/path
+++ b/config/path
@@ -165,9 +165,6 @@ XORG_PATH_RGB=/usr/lib/X11/rgb
 XORG_PATH_MODULES=/usr/lib/xorg/modules
 XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
-TOOLCHAIN_LANGUAGES=c
-[ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_CPP=${TARGET_PREFIX}cpp
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index a8c4098916..a8ba329581 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -79,7 +79,7 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --with-mpc=$ROOT/$TOOLCHAIN \
                          --without-ppl \
                          --without-cloog \
-                         --enable-languages=${TOOLCHAIN_LANGUAGES} \
+                         --enable-languages=c,c++ \
                          --with-gnu-as \
                          --with-gnu-ld \
                          --enable-__cxa_atexit \