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

Merge branch 'theotherjimmy-nb-consistant-paths' into rollup

pull/8387/head
Cruz Monrreal II 2018-10-11 13:18:48 -05:00
parent 19190d62d2 af6a21ac06
commit 21d5b838e2
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,9 +177,6 @@ class GNUARMNetbeans(Exporter):
sys_libs = [self.prepare_sys_lib(lib) for lib sys_libs = [self.prepare_sys_lib(lib) for lib
in self.toolchain.sys_libs] in self.toolchain.sys_libs]
preproc = " ".join([basename(self.toolchain.preproc[0])] +
self.toolchain.preproc[1:] +
self.toolchain.ld[1:])
if 'nbproject' in include_paths: if 'nbproject' in include_paths:
include_paths.remove('nbproject') include_paths.remove('nbproject')
@ -208,7 +205,7 @@ 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': " ".join(self.toolchain.preproc),
'cc_cmd': self.toolchain.cc[0], 'cc_cmd': self.toolchain.cc[0],
'cppc_cmd': self.toolchain.cppc[0], 'cppc_cmd': self.toolchain.cppc[0],
'asm_cmd': self.toolchain.asm[0], 'asm_cmd': self.toolchain.asm[0],