pwd in scanner-discovery, bug 237958.

1 files changed, 8 insertions, 0 deletions

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 e8c9e5c7893..df96d363837 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
@@ -241,6 +241,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;