summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-12-19 10:13:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-19 23:03:52 +0000
commit65a20a34af9e418b578d310827d76bf6106f1529 (patch)
treee2e09a6260fc8a3b55af8586cd0d47f70d411295
parent06aafff28d6c2ff3aab434ff7b3d2d947721cb5b (diff)
downloadopenembedded-core-contrib-65a20a34af9e418b578d310827d76bf6106f1529.tar.gz
openembedded-core-contrib-65a20a34af9e418b578d310827d76bf6106f1529.tar.bz2
openembedded-core-contrib-65a20a34af9e418b578d310827d76bf6106f1529.zip
base.bbclass, classextend.py: Drop catering to gcc-initial
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass1
-rw-r--r--meta/lib/oe/classextend.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e6af673847..f1a3c0e53e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -264,7 +264,6 @@ python base_eventhandler() {
if isinstance(e, bb.event.RecipePreFinalise):
if d.getVar("TARGET_PREFIX") == d.getVar("SDK_PREFIX"):
d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils")
- d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial")
d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc")
d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++")
d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs")
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index d2eeaf0e5c..662707b859 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -114,7 +114,7 @@ class NativesdkClassExtender(ClassExtender):
def map_depends(self, dep):
if dep.startswith(self.extname):
return dep
- if dep.endswith(("-gcc-initial", "-gcc", "-g++")):
+ if dep.endswith(("-gcc", "-g++")):
return dep + "-crosssdk"
elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep):
return dep