From 6b9042e6941e1fa9a4687bddbe1470c38878194b Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@blackberry.com>
Date: Sun, 6 May 2018 14:04:36 -0400
Subject: [PATCH] Extend GCC OS detection

If we can't tell from the second element, try the third. If
it's linux, we're good. If it's elf, use the second element.
This catches the esp32 xtensa compiler which is driving this
change and make sure we don't mess up too many others.

Change-Id: I4650e5fa309677c596e9f5f64f50bcc2ebdef334
---
 .../gcc/core/internal/GCCPathToolChainProvider.java      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
index 7debdd90391..73905b52a84 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
@@ -72,6 +72,15 @@ public class GCCPathToolChainProvider implements IToolChainProvider {
 									case "apple": //$NON-NLS-1$
 										gcc.setProperty(IToolChain.ATTR_OS, Platform.OS_MACOSX);
 										break;
+									default:
+										switch (tuple[2]) {
+										case "linux":
+											gcc.setProperty(IToolChain.ATTR_OS, Platform.OS_LINUX);
+											break;
+										case "elf":
+											gcc.setProperty(IToolChain.ATTR_OS, tuple[1]);
+											break;
+										}
 									}
 									try {
 										if (manager.getToolChain(gcc.getTypeId(), gcc.getId()) == null) {