Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2017-11-15 13:46:00 -0500
committerDoug Schaefer2017-11-15 16:18:19 -0500
commit589faf51cc35fe4d37711d1a30e835d93cb1f558 (patch)
tree599c23c798c426786d2219aa0048a006e2c5415f
parentf2ab40d9f266494145978534715a16fdae3b18b3 (diff)
downloadorg.eclipse.cdt-589faf51cc35fe4d37711d1a30e835d93cb1f558.tar.gz
org.eclipse.cdt-589faf51cc35fe4d37711d1a30e835d93cb1f558.tar.xz
org.eclipse.cdt-589faf51cc35fe4d37711d1a30e835d93cb1f558.zip
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
-rw-r--r--build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java2
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java2
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 4e6f63b9ca..d4ea171815 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 f0ad2cf070..7852c6b6a6 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());
}
}

Back to the top