From fc2132103ba4463e5d7b44f7dc2aeaaac12dfecc Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Tue, 4 Sep 2007 08:23:33 +0000
Subject: [PATCH] Fix for 202093 by Gerhard Schaber, per file scanner discovery
 ignores linked folders.

---
 .../gnu/GCCPerFileBOPConsoleParser.java        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParser.java
index 8b0940025ac..3b6afa43237 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParser.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParser.java
@@ -26,6 +26,8 @@ import org.eclipse.cdt.make.internal.core.scannerconfig.util.CCommandDSC;
 import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 
 
@@ -117,7 +119,21 @@ public class GCCPerFileBOPConsoleParser extends AbstractGCCBOPConsoleParser {
             
             CCommandDSC cmd = fUtil.getNewCCommandDSC(tokens, compilerInvocationIndex, extensionsIndex > 0);
             IPath baseDirectory = fUtil.getBaseDirectory();
-            if (baseDirectory.isPrefixOf(pFilePath)) {
+            boolean isValidPath = baseDirectory.isPrefixOf(pFilePath);
+            if (!isValidPath) {
+                IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
+                IFile[] foundOccurrences = wsRoot.findFilesForLocation(pFilePath);
+                if (foundOccurrences != null) {
+                	for (int j=0; j<foundOccurrences.length; j++) {
+                		IProject foundProject = foundOccurrences[j].getProject();
+                		if (foundProject != null && foundProject.getLocation().equals(baseDirectory)) {
+                			isValidPath = true;
+                			break;
+                		}
+                	}
+                }
+            }
+            if (isValidPath) {
 	            List cmdList = new ArrayList();
 	            cmdList.add(cmd);
 	            Map sc = new HashMap(1);