From 589faf51cc35fe4d37711d1a30e835d93cb1f558 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 15 Nov 2017 13:46:00 -0500 Subject: [PATCH] Fix up leftover toolchain provider id usage. The CMake toolchain file editor was not recording the correct toolchain. The same was also true for the toolchain selection in the build settings tab. Change-Id: I62e4c7ae0175da7c1b5ffb7f89e321a371a6e8e0 --- .../cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java | 2 +- .../src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java index 4e6f63b9cae..d4ea1718150 100644 --- a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java +++ b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java @@ -109,7 +109,7 @@ public class NewCMakeToolChainFilePage extends WizardPage { ICMakeToolChainFile file = manager.newToolChainFile(Paths.get(pathText.getText())); IToolChain tc = toolchains[tcCombo.getSelectionIndex()]; - file.setProperty(CMakeBuildConfiguration.TOOLCHAIN_TYPE, tc.getProvider().getId()); + file.setProperty(CMakeBuildConfiguration.TOOLCHAIN_TYPE, tc.getTypeId()); file.setProperty(CMakeBuildConfiguration.TOOLCHAIN_ID, tc.getId()); return file; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java index f0ad2cf070a..7852c6b6a63 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java @@ -167,7 +167,7 @@ public abstract class CommonBuildTab extends AbstractLaunchConfigurationTab { } else { IToolChain tc = toolchains[i - 1]; configuration.setAttribute(ICBuildConfiguration.TOOLCHAIN_ID, tc.getId()); - configuration.setAttribute(ICBuildConfiguration.TOOLCHAIN_TYPE, tc.getProvider().getId()); + configuration.setAttribute(ICBuildConfiguration.TOOLCHAIN_TYPE, tc.getTypeId()); } }