diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 1 | ||||
-rw-r--r-- | meta/lib/oe/classextend.py | 2 |
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() { | |||
264 | if isinstance(e, bb.event.RecipePreFinalise): | 264 | if isinstance(e, bb.event.RecipePreFinalise): |
265 | if d.getVar("TARGET_PREFIX") == d.getVar("SDK_PREFIX"): | 265 | if d.getVar("TARGET_PREFIX") == d.getVar("SDK_PREFIX"): |
266 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils") | 266 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils") |
267 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial") | ||
268 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc") | 267 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc") |
269 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++") | 268 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++") |
270 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs") | 269 | 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): | |||
114 | def map_depends(self, dep): | 114 | def map_depends(self, dep): |
115 | if dep.startswith(self.extname): | 115 | if dep.startswith(self.extname): |
116 | return dep | 116 | return dep |
117 | if dep.endswith(("-gcc-initial", "-gcc", "-g++")): | 117 | if dep.endswith(("-gcc", "-g++")): |
118 | return dep + "-crosssdk" | 118 | return dep + "-crosssdk" |
119 | elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): | 119 | elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): |
120 | return dep | 120 | return dep |