Skip to content

Commit f7b295a

Browse files
authored
Merge pull request #2049 from theotherjimmy/fix-gcc-arm-export
Fix a bug that caused the gcc_arm exporter to fail
2 parents 78cef9c + feea8d5 commit f7b295a

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

tools/toolchains/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ def relative_to(self, base, dot=False):
147147
v = [rel_path(f, base, dot) for f in getattr(self, field)]
148148
setattr(self, field, v)
149149

150-
for f in self.features:
151-
self.features[f] = rel_path(self.features[f], base, dot)
150+
self.features = {k: f.relative_to(base, dot) for k, f in self.features.iteritems()}
152151

153152
if self.linker_script is not None:
154153
self.linker_script = rel_path(self.linker_script, base, dot)
@@ -161,8 +160,7 @@ def win_to_unix(self):
161160
v = [f.replace('\\', '/') for f in getattr(self, field)]
162161
setattr(self, field, v)
163162

164-
for f in self.features:
165-
self.features[f] = self.features[f].replace('\\', '/')
163+
self.features = {k: f.win_to_unix() for k, f in self.features.iteritems()}
166164

167165
if self.linker_script is not None:
168166
self.linker_script = self.linker_script.replace('\\', '/')

0 commit comments

Comments
 (0)