[oe-commits] Richard Purdie : gcc: Drop gcc-cross4.inc, its pointless now

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e7e8fe11c34bf05179f3bbaa2fb1af7b7125696a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e7e8fe11c34bf05179f3bbaa2fb1af7b7125696a

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Aug 20 21:22:31 2013 +0000

gcc: Drop gcc-cross4.inc, its pointless now

The include was useful historically, its not anymore so lets remove it.
This should have no functional change except on any layers directly depending
on it or gcc-cross.inc but even then it would only impact sh4 and is easily
fixed if there was a problem.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/gcc/gcc-cross.inc    |    2 ++
 meta/recipes-devtools/gcc/gcc-cross4.inc   |    3 ---
 meta/recipes-devtools/gcc/gcc-cross_4.7.bb |    2 +-
 meta/recipes-devtools/gcc/gcc-cross_4.8.bb |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 9d29f56..2913df7 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -106,3 +106,5 @@ STOP
 	chmod +x ${B}/${TARGET_PREFIX}testgcc
 
 }
+
+EXTRA_OECONF_append_sh4 = " --with-multilib-list= --enable-incomplete-targets "
diff --git a/meta/recipes-devtools/gcc/gcc-cross4.inc b/meta/recipes-devtools/gcc/gcc-cross4.inc
deleted file mode 100644
index 4a20818..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross4.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require gcc-cross.inc
-
-EXTRA_OECONF_append_sh4 = " --with-multilib-list= --enable-incomplete-targets "
diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb
index d605235..b02ea13 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb
@@ -1,5 +1,5 @@
 require recipes-devtools/gcc/gcc-${PV}.inc
-require gcc-cross4.inc
+require gcc-cross.inc
 
 EXTRA_OECONF += "--disable-libunwind-exceptions \
                  --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \
diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb
index d605235..b02ea13 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb
@@ -1,5 +1,5 @@
 require recipes-devtools/gcc/gcc-${PV}.inc
-require gcc-cross4.inc
+require gcc-cross.inc
 
 EXTRA_OECONF += "--disable-libunwind-exceptions \
                  --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \