diff options
| author | Marc-Andre Laperle | 2020-09-29 02:50:32 +0000 |
|---|---|---|
| committer | Marc-Andre Laperle | 2020-09-29 02:50:32 +0000 |
| commit | 2cea3eba8bf34ac57c35a51ab19f276ca7223385 (patch) | |
| tree | e9f9db3fbb12fffe91d638b1d5fe746743604515 /windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw | |
| parent | 5af949d65681881a0abef3129415e4f2adf82d66 (diff) | |
| download | org.eclipse.cdt-2cea3eba8bf34ac57c35a51ab19f276ca7223385.tar.gz org.eclipse.cdt-2cea3eba8bf34ac57c35a51ab19f276ca7223385.tar.xz org.eclipse.cdt-2cea3eba8bf34ac57c35a51ab19f276ca7223385.zip | |
Bug 567169 - Detection for VS 2017 and VS2019 toolchain
Fix a NPE I just introduced. This method gets called before things are
initialized, just like before. I prefer being conservative by restoring
previous behavior and not change too many things by revising the
initialization sequence at the same time of other bigger changes.
Change-Id: I1096621e29b51c67d218c7e55eaf3ebe29858d07
Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
Diffstat (limited to 'windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw')
| -rw-r--r-- | windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java index 7ff261cab33..7f9a7c44b28 100644 --- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java +++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java @@ -100,7 +100,9 @@ public class WinEnvironmentVariableSupplier } public static IPath[] getIncludePath() { - // Include paths + if (envvars == null) + return new IPath[0]; + IBuildEnvironmentVariable var = envvars.get("INCLUDE"); //$NON-NLS-1$ if (var == null) return new IPath[0]; |