diff --git a/tools/export/nb/Makefile.tmpl b/tools/export/nb/Makefile.tmpl index a7254417b1..511311c6ef 100644 --- a/tools/export/nb/Makefile.tmpl +++ b/tools/export/nb/Makefile.tmpl @@ -51,7 +51,7 @@ CCADMIN=CCadmin BUILDDIR = BUILD PLATFORM = {{target}} -ELF2BIN = 'arm-none-eabi-objcopy' +ELF2BIN = '{{elf2bin_cmd}}' TARGET = ${CND_DISTDIR}/${CONF}/${CND_PLATFORM}/{{name}} diff --git a/tools/export/nb/__init__.py b/tools/export/nb/__init__.py index 97c9c6632d..c435b0d37d 100644 --- a/tools/export/nb/__init__.py +++ b/tools/export/nb/__init__.py @@ -243,7 +243,12 @@ class GNUARMNetbeans(Exporter): 'cpp_std': self.get_netbeans_cpp_std(cpp_std), 'linker_script': self.ld_script, '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 diff --git a/tools/export/nb/configurations.tmpl b/tools/export/nb/configurations.tmpl index 8eeeac258d..b53397a025 100644 --- a/tools/export/nb/configurations.tmpl +++ b/tools/export/nb/configurations.tmpl @@ -79,6 +79,7 @@ {{ symbol }} {% endfor -%} + {{cc_cmd}} {{ cpp_std }} @@ -104,6 +105,7 @@ {{ symbol }} {% endfor -%} + {{cppc_cmd}} 5 @@ -129,11 +131,12 @@ {{ symbol }} {% endfor -%} + {{asm_cmd}} ${CND_DISTDIR}/${CND_CONF}/{{target}}/{{name}}.elf ${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld - arm-none-eabi-gcc + {{ld_cmd}} -T ${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld {%- for symbol in opts['ld'] -%}{{" "+symbol}}{%- endfor -%} {%- for item in linker_libs -%}{{" "+item}}{%- endfor -%}