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

Author: Cruz Monrreal II

tools/export/nb/__init__.py

@@ -177,9 +177,6 @@ def create_jinja_ctx(self):
 
         sys_libs = [self.prepare_sys_lib(lib) for lib
                     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:
             include_paths.remove('nbproject')
@@ -208,7 +205,7 @@ def create_jinja_ctx(self):
             'cpp_std': self.get_netbeans_cpp_std(cpp_std),
             'linker_script': self.ld_script,
             'linker_libs': sys_libs,
-            'pp_cmd': preproc,
+            'pp_cmd': " ".join(self.toolchain.preproc),
             'cc_cmd': self.toolchain.cc[0],
             'cppc_cmd': self.toolchain.cppc[0],
             'asm_cmd': self.toolchain.asm[0],