[#496] - fix multi-arch projects

eclipse-embed-cdt · Oct 24, 2021 · e86a819 · e86a819
1 parent c57bac1
commit e86a819
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/...dbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/TabToolchains.java b/...dbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/TabToolchains.java
@@ -1100,7 +1100,8 @@ private boolean isThisPlugin() {
 		return true;
 	}
 
-	public static final String TYPE_PREFIX = "ilg.gnuarmeclipse.managedbuild.cross.target.";
+	public static final String TYPE_PREFIX_GNUARM = "ilg.gnuarmeclipse.managedbuild.cross.";
+	public static final String TYPE_PREFIX_GNUMCU = "ilg.gnumcueclipse.managedbuild.cross.";
 
 	private boolean isManaged() {
 
@@ -1109,11 +1110,16 @@ private boolean isManaged() {
 		IManagedProject managedProject = fConfig.getManagedProject();
 		IProjectType projectType = managedProject.getProjectType();
 
-		if (projectType == null || !projectType.getId().startsWith(TYPE_PREFIX)) {
-			return false;
+		if (projectType != null) {
+			String projectId = projectType.getId();
+			if (projectId.startsWith(TYPE_PREFIX_GNUARM)) {
+				return true;
+			} else if (projectId.startsWith(TYPE_PREFIX_GNUMCU)) {
+				return true;
+			}
 		}
 
-		return true;
+		return false;
 	}
 
 	/*

diff --git a/...ld.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/TabToolchains.java b/...ld.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/TabToolchains.java
@@ -1087,7 +1087,8 @@ private boolean isThisPlugin() {
 		return true;
 	}
 
-	public static final String TYPE_PREFIX = "ilg.gnumcueclipse.managedbuild.cross.riscv.target.";
+	public static final String TYPE_PREFIX_GNUARM = "ilg.gnuarmeclipse.managedbuild.cross.";
+	public static final String TYPE_PREFIX_GNUMCU = "ilg.gnumcueclipse.managedbuild.cross.";
 
 	private boolean isManaged() {
 
@@ -1096,11 +1097,16 @@ private boolean isManaged() {
 		IManagedProject managedProject = fConfig.getManagedProject();
 		IProjectType projectType = managedProject.getProjectType();
 
-		if (projectType == null || !projectType.getId().startsWith(TYPE_PREFIX)) {
-			return false;
+		if (projectType != null) {
+			String projectId = projectType.getId();
+			if (projectId.startsWith(TYPE_PREFIX_GNUARM)) {
+				return true;
+			} else if (projectId.startsWith(TYPE_PREFIX_GNUMCU)) {
+				return true;
+			}
 		}
 
-		return true;
+		return false;
 	}
 
 	/*