[OE-core] [morty][PATCH] Check libcc1 directory before disabling hardcoding of RPATHs

[Daniel Gomez]

Check if libcc1 directory exits before disabling hardcode_into_libs
configuration because of broken libtool in gcc recipes.

Signed-off-by: Daniel Gomez <daniel.gomez at silicon-gears.com>
---
 meta/recipes-devtools/gcc/gcc_5.4.bb | 3 ++-
 meta/recipes-devtools/gcc/gcc_6.4.bb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc_5.4.bb b/meta/recipes-devtools/gcc/gcc_5.4.bb
index b0a523c..9da8ece 100644
--- a/meta/recipes-devtools/gcc/gcc_5.4.bb
+++ b/meta/recipes-devtools/gcc/gcc_5.4.bb
@@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
 do_configure_prepend() {
 	# Easiest way to stop bad RPATHs getting into the library since we have a
 	# broken libtool here
-	sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
+	if [ -d "${S}/libcc1" ]; then
+		sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
 }
 
 BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/gcc/gcc_6.4.bb b/meta/recipes-devtools/gcc/gcc_6.4.bb
index b0a523c..9da8ece 100644
--- a/meta/recipes-devtools/gcc/gcc_6.4.bb
+++ b/meta/recipes-devtools/gcc/gcc_6.4.bb
@@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
 do_configure_prepend() {
 	# Easiest way to stop bad RPATHs getting into the library since we have a
 	# broken libtool here
-	sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
+	if [ -d "${S}/libcc1" ]; then
+		sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
 }
 
 BBCLASSEXTEND = "nativesdk"
-- 
2.7.4