From a736d7bf98270d28cc99dacc1b51246a2448c1af Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 25 Jun 2008 14:15:59 +0000
Subject: [PATCH] pwd in scanner discovery, bug 237958.

---
 .../gnu/GCCPerFileBOPConsoleParserUtility.java            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java
index 24be64a68a0..10acbe78eab 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java
@@ -256,6 +256,14 @@ public class GCCPerFileBOPConsoleParserUtility extends AbstractGCCBOPConsolePars
             if (!cwd.isAbsolute()) {
                 cwd = getBaseDirectory().append(cwd);
             }
+            if (filePath.startsWith("`pwd`")) { //$NON-NLS-1$
+            	if (filePath.length() > 5 && (filePath.charAt(5) == '/' || filePath.charAt(5) == '\\')) {
+            		filePath = filePath.substring(6);
+            	}
+            	else {
+            		filePath = filePath.substring(5);
+            	}
+            }
             pFilePath = cwd.append(filePath);
         }
         return pFilePath;