Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDoug Schaefer2018-06-16 16:46:04 -0400
committerDoug Schaefer2018-06-16 17:16:36 -0400
commit166c4ce28fce942c77333439b17fa66521718685 (patch)
treeffae9909670288e41b05021836a45fa7591fd01f /build
parentcf410f19823fafe851d5915abc386ef982adfcdc (diff)
downloadorg.eclipse.cdt-166c4ce28fce942c77333439b17fa66521718685.tar.gz
org.eclipse.cdt-166c4ce28fce942c77333439b17fa66521718685.tar.xz
org.eclipse.cdt-166c4ce28fce942c77333439b17fa66521718685.zip
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 (cherry picked from commit 3b44424539ec13eaf9df2eab2f2b8ab9b2df8901)
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java3
1 files changed, 3 insertions, 0 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 2c3f56b0e2..fb521623da 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());
}

Back to the top