diff options
Diffstat (limited to 'meta/lib/oe/classextend.py')
-rw-r--r-- | meta/lib/oe/classextend.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 8d7e428d8a..5161d33d2d 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -32,7 +32,8 @@ class ClassExtender(object): | |||
32 | if name.endswith("-" + self.extname): | 32 | if name.endswith("-" + self.extname): |
33 | name = name.replace("-" + self.extname, "") | 33 | name = name.replace("-" + self.extname, "") |
34 | if name.startswith("virtual/"): | 34 | if name.startswith("virtual/"): |
35 | if "binutils" in name: | 35 | # Assume large numbers of dashes means a triplet is present and we don't need to convert |
36 | if name.count("-") >= 3 and name.endswith(("-go", "-binutils", "-gcc", "-g++")): | ||
36 | return name | 37 | return name |
37 | subs = name.split("/", 1)[1] | 38 | subs = name.split("/", 1)[1] |
38 | if not subs.startswith(self.extname): | 39 | if not subs.startswith(self.extname): |
@@ -152,9 +153,7 @@ class NativesdkClassExtender(ClassExtender): | |||
152 | def map_depends(self, dep): | 153 | def map_depends(self, dep): |
153 | if dep.startswith(self.extname): | 154 | if dep.startswith(self.extname): |
154 | return dep | 155 | return dep |
155 | if dep.endswith(("-gcc", "-g++")): | 156 | if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): |
156 | return dep + "-crosssdk" | ||
157 | elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): | ||
158 | return dep | 157 | return dep |
159 | else: | 158 | else: |
160 | return self.extend_name(dep) | 159 | return self.extend_name(dep) |