diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java index 4be743225b9..397fb48539a 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java @@ -30,6 +30,7 @@ import org.eclipse.cdt.make.internal.core.makefile.gnu.GNUMakefile; import org.eclipse.cdt.make.internal.core.makefile.posix.PosixMakefile; import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredPathManager; import org.eclipse.cdt.make.internal.core.scannerconfig.ScannerConfigInfoFactory; +import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerConfigUtil; import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -311,6 +312,8 @@ public class MakeCorePlugin extends Plugin { //Set debug tracing options configurePluginDebugOptions(); + // Scanner config discovery setup + GCCScannerConfigUtil.createSpecs(); } private static final String SCANNER_CONFIG = MakeCorePlugin.getUniqueIdentifier() + "/debug/scdiscovery"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java index 9517147785b..7b9a837fef2 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/GCCSpecsRunSIProvider.java @@ -19,7 +19,6 @@ import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes; import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerConfigUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; /** * Runs a command to retrieve compiler intrinsic scanner info from 'specs' file. @@ -44,10 +43,6 @@ public class GCCSpecsRunSIProvider extends DefaultRunSIProvider { else if (project.hasNature(CProjectNature.C_NATURE_ID)) { targetFile = GCCScannerConfigUtil.C_SPECS_FILE; } - IPath path2File = MakeCorePlugin.getWorkingDirectory().append(targetFile); - if (!path2File.toFile().exists()) { - GCCScannerConfigUtil.createSpecs(); - } // replace string variables in compile arguments // TODO Vmir - use string variable replacement for (int i = 0; i < fCompileArguments.length; ++i) {