Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDoug Schaefer2018-11-29 13:31:16 -0500
committerDoug Schaefer2018-11-29 13:31:16 -0500
commit1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e (patch)
tree1b42d47a626f7d160e4669422c55148cf66527d6 /build
parent62143e2bd7ac7a213a69cd350abb0fdab3616529 (diff)
downloadorg.eclipse.cdt-1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e.tar.gz
org.eclipse.cdt-1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e.tar.xz
org.eclipse.cdt-1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e.zip
Bug 541709 Fix up exceptions when we can't find toolchains.
We weren't checking the case where the size of the toolchains array was zero. Return a null config in that case and fix up the CommonBuildTab to deal with that. Change-Id: Ibd8f659988f1463570bdb2654d6ea2b4a45866c2
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java
index dcc818da4e..c3700801ea 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java
@@ -157,6 +157,9 @@ public class MakeBuildSettingsTab extends CommonBuildTab {
super.initializeFrom(configuration);
ICBuildConfiguration buildConfig = getBuildConfiguration();
+ if (buildConfig == null) {
+ return;
+ }
String container = buildConfig.getProperty(StandardBuildConfiguration.BUILD_CONTAINER);
if (container != null && !container.trim().isEmpty()) {
IPath containerLoc = new Path(container);

Back to the top