ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix whitespaces missed by merge tool

pull/4/head
Emilio Monti 2013-04-26 17:51:31 +01:00
parent 2f74fffc00
commit 0fc4d497b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
workspace_tools/toolchains.py
View File

@ -166,9 +166,9 @@ class mbedToolchain:
if not exists(target): if not exists(target):
return True return True
target_mod_time = stat(target).st_mtime target_mod_time = stat(target).st_mtime
for d in dependencies: for d in dependencies:
# Some objects are not provided with full path and here we do not have # Some objects are not provided with full path and here we do not have
# information about the library paths. Safe option: assume an update # information about the library paths. Safe option: assume an update
@ -375,8 +375,8 @@ class mbedToolchain:
self.debug("LPC Patch %s" % (name + '.bin')) self.debug("LPC Patch %s" % (name + '.bin'))
patch(bin) patch(bin)
self.var("compile_succeded", True) self.var("compile_succeded", True)
self.var("binary", name+'.bin') self.var("binary", name+'.bin')
return bin return bin
@ -469,7 +469,7 @@ class ARM(mbedToolchain):
# because when the .d files are generated, armcc is chrooted # because when the .d files are generated, armcc is chrooted
dependencies.append(self.CHROOT + match.group('file')) dependencies.append(self.CHROOT + match.group('file'))
else: else:
dependencies.append(match.group('file')) dependencies.append(match.group('file'))
return dependencies return dependencies
def parse_output(self, output): def parse_output(self, output):