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

Merge pull request #6229 from hug-dev/fix-elf-output-extension 

Fix a bug using ELF as output extension
pull/6102/head
Cruz Monrreal 2018-02-27 16:32:40 -06:00 committed by GitHub
parent 5077644e6b b0027c1e81
commit 8b6a7aacc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/toolchains/__init__.py
View File

@ -1130,8 +1130,10 @@ class mbedToolchain:
mkdir(new_path) mkdir(new_path)
filename = name+'.'+ext filename = name+'.'+ext
# Absolute path of the final linked file
full_path = join(tmp_path, filename)
elf = join(tmp_path, name + '.elf') elf = join(tmp_path, name + '.elf')
bin = None if ext is 'elf' else join(tmp_path, filename) bin = None if ext == 'elf' else full_path
map = join(tmp_path, name + '.map') map = join(tmp_path, name + '.map')
r.objects = sorted(set(r.objects)) r.objects = sorted(set(r.objects))
@ -1155,7 +1157,7 @@ class mbedToolchain:
self.var("compile_succeded", True) self.var("compile_succeded", True)
self.var("binary", filename) self.var("binary", filename)
return bin, needed_update return full_path, needed_update
# THIS METHOD IS BEING OVERRIDDEN BY THE MBED ONLINE BUILD SYSTEM # THIS METHOD IS BEING OVERRIDDEN BY THE MBED ONLINE BUILD SYSTEM
# ANY CHANGE OF PARAMETERS OR RETURN VALUES WILL BREAK COMPATIBILITY # ANY CHANGE OF PARAMETERS OR RETURN VALUES WILL BREAK COMPATIBILITY