Merge pull request #7939 from theotherjimmy/fix-embitz-ld-assign

Export, Embitz: Avoid assigning `self.resources.linker_script`
pull/8029/head
Cruz Monrreal 2018-09-06 15:23:17 -05:00 committed by GitHub
commit 27f3fd92f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions

View File

@ -64,17 +64,13 @@ class EmBitz(Exporter):
l, _ = splitext(basename(lib))
libraries.append(l[3:])
if self.resources.linker_script is None:
self.resources.linker_script = ''
ctx = {
'name': self.project_name,
'target': self.target,
'toolchain': self.toolchain.name,
'source_files': source_files,
'include_paths': self.resources.inc_dirs,
'script_file': self.resources.linker_script,
'script_file': self.resources.linker_script or '',
'library_paths': self.resources.lib_dirs,
'libraries': libraries,
'symbols': self.toolchain.get_symbols(),