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

Added Compiler Toolchain Varibales in Templates and modfied generation of jinja

pull/5954/head
c.mandl 2018-01-15 10:44:36 +01:00 committed by Cruz Monrreal II‰
parent 6cb6f5810c
commit 875425161a
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/export/nb/Makefile.tmpl
View File

@ -51,7 +51,7 @@ CCADMIN=CCadmin
BUILDDIR = BUILD BUILDDIR = BUILD
PLATFORM = {{target}} PLATFORM = {{target}}
ELF2BIN = 'arm-none-eabi-objcopy' ELF2BIN = '{{elf2bin_cmd}}'
TARGET = ${CND_DISTDIR}/${CONF}/${CND_PLATFORM}/{{name}} TARGET = ${CND_DISTDIR}/${CONF}/${CND_PLATFORM}/{{name}}

7
tools/export/nb/__init__.py
View File

@ -243,7 +243,12 @@ class GNUARMNetbeans(Exporter):
'cpp_std': self.get_netbeans_cpp_std(cpp_std), 'cpp_std': self.get_netbeans_cpp_std(cpp_std),
'linker_script': self.ld_script, 'linker_script': self.ld_script,
'linker_libs': sys_libs, 'linker_libs': sys_libs,
'pp_cmd': preproc 'pp_cmd': preproc,
'cc_cmd': self.toolchain.cc[0],
'cppc_cmd': self.toolchain.cppc[0],
'asm_cmd': self.toolchain.asm[0],
'ld_cmd': self.toolchain.ld[0],
'elf2bin_cmd': self.toolchain.elf2bin
} }
return jinja_ctx return jinja_ctx

5
tools/export/nb/configurations.tmpl
View File

@ -79,6 +79,7 @@
<Elem>{{ symbol }}</Elem> <Elem>{{ symbol }}</Elem>
{% endfor -%} {% endfor -%}
</preprocessorList> </preprocessorList>
<commandlineTool>{{cc_cmd}}</commandlineTool>
</cTool> </cTool>
<ccTool> <ccTool>
<standard>{{ cpp_std }}</standard> <standard>{{ cpp_std }}</standard>
@ -104,6 +105,7 @@
<Elem>{{ symbol }}</Elem> <Elem>{{ symbol }}</Elem>
{% endfor -%} {% endfor -%}
</preprocessorList> </preprocessorList>
<commandlineTool>{{cppc_cmd}}</commandlineTool>
</ccTool> </ccTool>
<fortranCompilerTool> <fortranCompilerTool>
<developmentMode>5</developmentMode> <developmentMode>5</developmentMode>
@ -129,11 +131,12 @@
<Elem>{{ symbol }}</Elem> <Elem>{{ symbol }}</Elem>
{% endfor -%} {% endfor -%}
</preprocessorList> </preprocessorList>
<commandlineTool>{{asm_cmd}}</commandlineTool>
</asmTool> </asmTool>
<linkerTool> <linkerTool>
<output>${CND_DISTDIR}/${CND_CONF}/{{target}}/{{name}}.elf</output> <output>${CND_DISTDIR}/${CND_CONF}/{{target}}/{{name}}.elf</output>
<additionalDep>${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld</additionalDep> <additionalDep>${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld</additionalDep>
<commandlineTool>arm-none-eabi-gcc</commandlineTool> <commandlineTool>{{ld_cmd}}</commandlineTool>
<commandLine>-T ${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld {%- for symbol in opts['ld'] -%}{{" "+symbol}}{%- endfor -%} {%- for item in linker_libs -%}{{" "+item}}{%- endfor -%} </commandLine> <commandLine>-T ${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld {%- for symbol in opts['ld'] -%}{{" "+symbol}}{%- endfor -%} {%- for item in linker_libs -%}{{" "+item}}{%- endfor -%} </commandLine>
</linkerTool> </linkerTool>
</compileType> </compileType>