diff options
Diffstat (limited to 'build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2')
| -rw-r--r-- | build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java index 3c207f1241e..0ef20d28b24 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java @@ -211,9 +211,13 @@ public class DefaultRunSIProvider implements IExternalScannerInfoProvider { protected String[] setEnvironment(CommandLauncher launcher, Properties initialEnv) { // Set the environmennt, some scripts may need the CWD var to be set. Properties props = initialEnv != null ? initialEnv : launcher.getEnvironment(); - props.put("CWD", fWorkingDirectory.toOSString()); //$NON-NLS-1$ - props.put("PWD", fWorkingDirectory.toOSString()); //$NON-NLS-1$ - // On POSIX (Linux, UNIX) systems reset LANG variable to English with UTF-8 encoding + + if (fWorkingDirectory != null) { + props.put("CWD", fWorkingDirectory.toOSString()); //$NON-NLS-1$ + props.put("PWD", fWorkingDirectory.toOSString()); //$NON-NLS-1$ + } + // On POSIX (Linux, UNIX) systems reset LANG variable to English with + // UTF-8 encoding // since GNU compilers can handle only UTF-8 characters. English language is chosen // beacuse GNU compilers inconsistently handle different locales when generating // output of the 'gcc -v' command. Include paths with locale characters will be |