mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

follow-up for the [Bug 182821] ManagedBuildInfo.getIncludePaths() no longer returns default compiler path

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-04-25 13:41:07 +00:00
parent 315771b3bf
commit 48e6862bed
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java
View file

@ -180,17 +180,23 @@ public class CfgScannerConfigInfoFactory2 {
if(info == null && !type.isExtensionElement() && type.getSuperClass() != null){ if(info == null && !type.isExtensionElement() && type.getSuperClass() != null){
CfgInfoContext superContext = new CfgInfoContext(rcInfo, tool, type.getSuperClass()); CfgInfoContext superContext = new CfgInfoContext(rcInfo, tool, type.getSuperClass());
superContext = CfgScannerConfigUtil.adjustPerRcTypeContext(superContext); superContext = CfgScannerConfigUtil.adjustPerRcTypeContext(superContext);
if(superContext != null){ if(superContext != null && superContext.getResourceInfo() != null){
info = (IScannerConfigBuilderInfo2)configMap.get(superContext); info = (IScannerConfigBuilderInfo2)configMap.get(superContext);
} }
}
if(info == null){
String id = CfgScannerConfigUtil.getDefaultProfileId(context); String id = CfgScannerConfigUtil.getDefaultProfileId(context);
InfoContext baseContext = context.toInfoContext(); InfoContext baseContext = context.toInfoContext();
if(id != null){ if(info == null){
info = container.createInfo(baseContext, id); if(id != null){
info = container.createInfo(baseContext, id);
} else {
info = container.createInfo(baseContext);
}
} else { } else {
info = container.createInfo(baseContext); if(id != null){
info = container.createInfo(baseContext, info, id);
} else {
info = container.createInfo(baseContext, info);
}
} }
} }
if(info != null){ if(info != null){