Skip to content

Commit 4aef073

Browse files
committed
Export, nb: Use same path for cpp as the rest of the tools
### Description The netbeans exporter was being inconsistant with it's invocation of the C pre-processor on the linker script: the C pre-processor was always invoked from `$PATH` where as the rest of the tools were invoked as configured by the tools. This changes the invocation of CPP to match the rest of the tools: heed the conifguration. Fixes ARMmbed/mbed-cli#663 ### Pull request type [x] Fix [ ] Refactor [ ] Target update [ ] Functionality change [ ] Breaking change
1 parent 6b85ec7 commit 4aef073

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

tools/export/nb/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ def create_jinja_ctx(self):
177177

178178
sys_libs = [self.prepare_sys_lib(lib) for lib
179179
in self.toolchain.sys_libs]
180-
preproc = " ".join([basename(self.toolchain.preproc[0])] +
181-
self.toolchain.preproc[1:] +
182-
self.toolchain.ld[1:])
183180

184181
if 'nbproject' in include_paths:
185182
include_paths.remove('nbproject')
@@ -208,7 +205,7 @@ def create_jinja_ctx(self):
208205
'cpp_std': self.get_netbeans_cpp_std(cpp_std),
209206
'linker_script': self.ld_script,
210207
'linker_libs': sys_libs,
211-
'pp_cmd': preproc,
208+
'pp_cmd': " ".join(self.toolchain.preproc),
212209
'cc_cmd': self.toolchain.cc[0],
213210
'cppc_cmd': self.toolchain.cppc[0],
214211
'asm_cmd': self.toolchain.asm[0],

0 commit comments

Comments
 (0)