Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2017-10-18 15:43:13 +0000
committerDoug Schaefer2017-10-18 16:41:40 +0000
commit416fed4d94b77d9f312fe341aa534069af8c23a2 (patch)
tree8f8a7b8b346f2dc81bfe939095eef34dc53df287 /build/org.eclipse.cdt.build.gcc.core
parent736d7b59550dcb1a20ab68020bd030cc4d7b086e (diff)
downloadorg.eclipse.cdt-416fed4d94b77d9f312fe341aa534069af8c23a2.tar.gz
org.eclipse.cdt-416fed4d94b77d9f312fe341aa534069af8c23a2.tar.xz
org.eclipse.cdt-416fed4d94b77d9f312fe341aa534069af8c23a2.zip
Make CMake support more resilient.
Add c++ to GCCToolChain since that's what CMake uses by default for MinGW. Synchronize the scannerInfoCache loading. Double check for toolchain files at load time for configs that don't have any. Change-Id: I8071e285ce5deb1448cabd45f394c62fe6a7f2f4
Diffstat (limited to 'build/org.eclipse.cdt.build.gcc.core')
-rw-r--r--build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index 4665dda940e..1425a4f0da8 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -474,7 +474,8 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
cppCommand = null;
if (cCommand.contains("gcc")) { //$NON-NLS-1$
cppCommand = cCommand.replace("gcc", "g++"); //$NON-NLS-1$ //$NON-NLS-2$
- commands = new String[] { cCommand, cppCommand };
+ // Also recognize c++ as an alias for g++
+ commands = new String[] { cCommand, cppCommand, cCommand.replace("gcc", "c++") }; //$NON-NLS-1$ //$NON-NLS-2$
} else if (cCommand.contains("clang")) { //$NON-NLS-1$
cppCommand = cCommand.replace("clang", "clang++"); //$NON-NLS-1$ //$NON-NLS-2$
commands = new String[] { cCommand, cppCommand };

Back to the top