mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

BUg 212474, check makefile device for included files

Browse source
This commit is contained in:
Ken Ryall 2008-01-18 21:27:36 +00:00
parent f1a4cdb2c4
commit 30cb19ee08
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/Include.java
View file

@ -16,6 +16,7 @@ import org.eclipse.cdt.make.core.makefile.IDirective;
import org.eclipse.cdt.make.core.makefile.gnu.IInclude; import org.eclipse.cdt.make.core.makefile.gnu.IInclude;
import org.eclipse.cdt.make.internal.core.makefile.Directive; import org.eclipse.cdt.make.internal.core.makefile.Directive;
import org.eclipse.cdt.make.internal.core.makefile.Parent; import org.eclipse.cdt.make.internal.core.makefile.Parent;
import org.eclipse.core.runtime.Path;
public class Include extends Parent implements IInclude { public class Include extends Parent implements IInclude {
@ -51,7 +52,21 @@ public class Include extends Parent implements IInclude {
continue; continue;
} catch (IOException e) { } catch (IOException e) {
} }
if (!filenames[i].startsWith(GNUMakefile.FILE_SEPARATOR) && dirs != null) { if (filenames[i].startsWith(GNUMakefile.FILE_SEPARATOR)) {
// Try to set the device to that of the parent makefile.
String filename = getFileName();
if (filename != null) {
String device = new Path(filename).getDevice();
if (device != null) {
try {
gnu.parse(new Path(filenames[i]).setDevice(device).toOSString());
addDirective(gnu);
continue;
} catch (IOException e) {
}
}
}
} else if (dirs != null) {
for (int j = 0; j < dirs.length; j++) { for (int j = 0; j < dirs.length; j++) {
try { try {
String filename = dirs[j] + GNUMakefile.FILE_SEPARATOR + filenames[i]; String filename = dirs[j] + GNUMakefile.FILE_SEPARATOR + filenames[i];