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 #3187 from theotherjimmy/fix-eclipse-export 

[Export-Make] Use internal class variable for resolving templates in makefiles
pull/3198/head
Sam Grove 2016-11-03 18:48:13 -05:00 committed by GitHub
parent 9105f6fbda c2470e9710
commit f044786f22
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,12 +91,12 @@ class Makefile(Exporter):
ctx.update(self.flags) ctx.update(self.flags)
for templatefile in \ for templatefile in \
['makefile/%s_%s.tmpl' % (self.NAME.lower(), ['makefile/%s_%s.tmpl' % (self.TEMPLATE,
self.target.lower())] + \ self.target.lower())] + \
['makefile/%s_%s.tmpl' % (self.NAME.lower(), ['makefile/%s_%s.tmpl' % (self.TEMPLATE,
label.lower()) for label label.lower()) for label
in self.toolchain.target.extra_labels] +\ in self.toolchain.target.extra_labels] +\
['makefile/%s.tmpl' % self.NAME.lower()]: ['makefile/%s.tmpl' % self.TEMPLATE]:
try: try:
self.gen_file(templatefile, ctx, 'Makefile') self.gen_file(templatefile, ctx, 'Makefile')
break break
@ -143,6 +143,7 @@ class GccArm(Makefile):
TARGETS = [target for target, obj in TARGET_MAP.iteritems() TARGETS = [target for target, obj in TARGET_MAP.iteritems()
if "GCC_ARM" in obj.supported_toolchains] if "GCC_ARM" in obj.supported_toolchains]
NAME = 'Make-GCC-ARM' NAME = 'Make-GCC-ARM'
TEMPLATE = 'make-gcc-arm'
TOOLCHAIN = "GCC_ARM" TOOLCHAIN = "GCC_ARM"
LINK_SCRIPT_OPTION = "-T" LINK_SCRIPT_OPTION = "-T"
USER_LIBRARY_FLAG = "-L" USER_LIBRARY_FLAG = "-L"
@ -157,6 +158,7 @@ class Armc5(Makefile):
TARGETS = [target for target, obj in TARGET_MAP.iteritems() TARGETS = [target for target, obj in TARGET_MAP.iteritems()
if "ARM" in obj.supported_toolchains] if "ARM" in obj.supported_toolchains]
NAME = 'Make-ARMc5' NAME = 'Make-ARMc5'
TEMPLATE = 'make-armc5'
TOOLCHAIN = "ARM" TOOLCHAIN = "ARM"
LINK_SCRIPT_OPTION = "--scatter" LINK_SCRIPT_OPTION = "--scatter"
USER_LIBRARY_FLAG = "--userlibpath " USER_LIBRARY_FLAG = "--userlibpath "
@ -171,6 +173,7 @@ class IAR(Makefile):
TARGETS = [target for target, obj in TARGET_MAP.iteritems() TARGETS = [target for target, obj in TARGET_MAP.iteritems()
if "IAR" in obj.supported_toolchains] if "IAR" in obj.supported_toolchains]
NAME = 'Make-IAR' NAME = 'Make-IAR'
TEMPLATE = 'make-iar'
TOOLCHAIN = "IAR" TOOLCHAIN = "IAR"
LINK_SCRIPT_OPTION = "--config" LINK_SCRIPT_OPTION = "--config"
USER_LIBRARY_FLAG = "-L" USER_LIBRARY_FLAG = "-L"