mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-09-10 12:03:16 +02:00
bug 284549: [Scanner Discovery] include path outside workspace may not be scanned in case of conflicting source file name
Based on patch from Claire Reynaud
This commit is contained in:
parent
815658b790
commit
e78518838c
1 changed files with 10 additions and 2 deletions
|
@ -15,6 +15,7 @@ package org.eclipse.cdt.make.internal.core.scannerconfig.gnu;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@ -174,8 +175,15 @@ public class GCCScannerInfoConsoleParser extends AbstractGCCBOPConsoleParser {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (file == null && fUtil != null) { // real world case
|
if (file == null && fUtil != null) { // real world case
|
||||||
// remove include paths since there was no chance to translate them
|
// remove non-absolute include paths since there was no chance to translate them
|
||||||
translatedIncludes.clear();
|
Iterator<String> iterator = translatedIncludes.iterator();
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
String include = iterator.next();
|
||||||
|
IPath includePath = new Path(include);
|
||||||
|
if (!includePath.isAbsolute() && !includePath.isUNC()) { // do not translate UNC paths
|
||||||
|
iterator.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Contribute discovered includes and symbols to the ScannerInfoCollector
|
// Contribute discovered includes and symbols to the ScannerInfoCollector
|
||||||
|
|
Loading…
Add table
Reference in a new issue