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

Correct call to add_file_ref

pull/9966/head
Brian Daniels 2019-04-05 11:46:39 -05:00
parent 3b9baf9600
commit 2a080a0840
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/export/makefile/__init__.py
View File

@ -272,10 +272,14 @@ class Arm(Makefile):
if self.resources.linker_script: if self.resources.linker_script:
sct_file = self.resources.get_file_refs(FileType.LD_SCRIPT)[-1] sct_file = self.resources.get_file_refs(FileType.LD_SCRIPT)[-1]
new_script = self.toolchain.correct_scatter_shebang( new_script = self.toolchain.correct_scatter_shebang(
sct_file, dirname(sct_file.name)) sct_file, dirname(sct_file.name)
)
if new_script is not sct_file: if new_script is not sct_file:
self.resources.add_files_to_type( self.resources.add_file_ref(
FileType.LD_SCRIPT, [new_script]) FileType.LD_SCRIPT,
new_script.name,
new_script.path
)
return super(Arm, self).generate() return super(Arm, self).generate()
class Armc5(Arm): class Armc5(Arm):

2
tools/toolchains/arm.py
View File

@ -284,7 +284,7 @@ class ARM(mbedToolchain):
scatter file scatter file
Return: Return:
The location of the correct scatter file The FileRef of the correct scatter file
Side Effects: Side Effects:
This method MAY write a new scatter file to disk This method MAY write a new scatter file to disk