diff options
| author | Doug Schaefer | 2017-10-18 15:43:13 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2017-10-18 16:41:40 +0000 |
| commit | 416fed4d94b77d9f312fe341aa534069af8c23a2 (patch) | |
| tree | 8f8a7b8b346f2dc81bfe939095eef34dc53df287 /core | |
| parent | 736d7b59550dcb1a20ab68020bd030cc4d7b086e (diff) | |
| download | org.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 'core')
| -rw-r--r-- | core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java index c6137462782..f9222e48b46 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java @@ -554,7 +554,7 @@ public abstract class CBuildConfiguration extends PlatformObject /** * @since 6.1 */ - protected void loadScannerInfoCache() { + protected synchronized void loadScannerInfoCache() { if (scannerInfoCache == null) { File cacheFile = getScannerInfoCacheFile(); if (cacheFile.exists()) { |