From 3b44424539ec13eaf9df2eab2f2b8ab9b2df8901 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Sat, 16 Jun 2018 16:46:04 -0400 Subject: [PATCH] Bug 535972 deal with relative include paths in GCC scanner info We weren't dealting with relative include paths returned from the call to gcc -E properly. Resolves them against the build directory before checking if their a directory. Results in them added. Tested with ESP-IDF's feature/cmake branch. Change-Id: I1e2583e03cce6380ee4382146b177978c9c81806 --- .../src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java | 3 +++ 1 file changed, 3 insertions(+) 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 2c3f56b0e27..fb521623dae 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 @@ -471,6 +471,9 @@ public class GCCToolChain extends PlatformObject implements IToolChain { } else { try { Path dirPath = Paths.get(dir); + if (!dirPath.isAbsolute()) { + dirPath = buildDirectory.resolve(dirPath); + } if (Files.isDirectory(dirPath)) { includePath.add(dirPath.toString()); }