Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDoug Schaefer2016-09-15 19:01:48 +0000
committerGerrit Code Review @ Eclipse.org2016-09-16 14:46:47 +0000
commitfb533553c88a4c1d3349f04220b4de2dfeb5ffa2 (patch)
treea8635a27f065cefb9fc2afc5dc8c21bcb7e63e48 /build
parent25d4502b8030063a089ba4b2f5e54aa87374ade4 (diff)
downloadorg.eclipse.cdt-fb533553c88a4c1d3349f04220b4de2dfeb5ffa2.tar.gz
org.eclipse.cdt-fb533553c88a4c1d3349f04220b4de2dfeb5ffa2.tar.xz
org.eclipse.cdt-fb533553c88a4c1d3349f04220b4de2dfeb5ffa2.zip
Fix to better handle build output parsing random text.
Handle failures when trying to find the resource at the end of a command line when it's not really a command line. Change-Id: I7dc94a2c45c758248d0402c253e077142ee050e3
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index 8be04d5d92d..5f5f47986a0 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -423,7 +423,12 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
if (srcPath.isAbsolute()) {
uri = srcPath.toUri();
} else {
- uri = buildDirectoryURI.resolve(arg);
+ try {
+ uri = buildDirectoryURI.resolve(arg);
+ } catch (IllegalArgumentException e) {
+ // Bad URI
+ continue;
+ }
}
for (IFile resource : root.findFilesForLocationURI(uri)) {

Back to the top