From df2fd3ed559f2cb845f1dc263a6a3ad09d37dc3a Mon Sep 17 00:00:00 2001
From: Serge Semin <fancer.lancer@gmail.com>
Date: Wed, 4 Apr 2018 01:38:36 +0500
Subject: [PATCH] gcc-external{.inc,-cross}: use non-prefixed gcc_binaries

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 recipes-external/gcc/gcc-external-cross.bb |  2 +-
 recipes-external/gcc/gcc-external.inc      | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/recipes-external/gcc/gcc-external-cross.bb b/recipes-external/gcc/gcc-external-cross.bb
index ad74ae6..23a9ef4 100644
--- a/recipes-external/gcc/gcc-external-cross.bb
+++ b/recipes-external/gcc/gcc-external-cross.bb
@@ -10,4 +10,4 @@ PROVIDES += "\
     virtual/${TARGET_PREFIX}g++ \
 "
 
-EXTERNAL_CROSS_BINARIES = "${@'${gcc_binaries}'.replace('${TARGET_PREFIX}', '')}"
+EXTERNAL_CROSS_BINARIES = "${gcc_binaries}"
diff --git a/recipes-external/gcc/gcc-external.inc b/recipes-external/gcc/gcc-external.inc
index ad80eee..f88582d 100644
--- a/recipes-external/gcc/gcc-external.inc
+++ b/recipes-external/gcc/gcc-external.inc
@@ -3,14 +3,5 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 PV = "${GCC_VERSION}"
 
-gcc_binaries = "\
-    ${TARGET_PREFIX}gcc \
-    ${TARGET_PREFIX}gcc-${@'${PV}'.replace('${EXTERNAL_PV_SUFFIX}', '')} \
-    ${TARGET_PREFIX}gcc-ar \
-    ${TARGET_PREFIX}gcc-nm \
-    ${TARGET_PREFIX}gcc-ranlib \
-    ${TARGET_PREFIX}gcov \
-    ${TARGET_PREFIX}c++ \
-    ${TARGET_PREFIX}g++ \
-    ${TARGET_PREFIX}cpp \
-"
+gcc_binaries = "gcc gcc-${@'${PV}'.replace('${EXTERNAL_PV_SUFFIX}', '')} \
+                gcc-ar gcc-nm gcc-ranlib cc gcov gcov-tool c++ g++ cpp gfortran"