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

Bug 378270 - xlc macro supplier doesn't overwrite old values for

Browse source 
compiler root location
This commit is contained in:
Chris Recoskie 2012-05-02 14:49:05 -04:00
parent fcaa09aaf8
commit 53306d93e9
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/XLCProjectMacroSupplier.java
View file

@ -101,14 +101,34 @@ public class XLCProjectMacroSupplier implements IProjectBuildMacroSupplier {
// our array consists of our macro, plus all the macros from our parent // our array consists of our macro, plus all the macros from our parent
IBuildMacro[] parentMacros = provider.getMacros(IBuildMacroProvider.CONTEXT_PROJECT, project, true); IBuildMacro[] parentMacros = provider.getMacros(IBuildMacroProvider.CONTEXT_PROJECT, project, true);
int numMacros = parentMacros.length + 1; // +1 for our macro
// look for an existing macro definition
int foundIndex = -1;
for(int k = 0; k < parentMacros.length; k++) {
if(parentMacros[k].getName().equals(macro.getName())) {
foundIndex = k;
break;
}
}
int numMacros = (foundIndex == -1) ? parentMacros.length + 1 : parentMacros.length;
IBuildMacro[] macros = new IBuildMacro[numMacros]; IBuildMacro[] macros = new IBuildMacro[numMacros];
macros[0] = macro; // if there was no existing value then add it to the front
if(foundIndex == -1) {
macros[0] = macro;
for(int k = 1; k < macros.length; k++) {
macros[k] = parentMacros[k-1];
}
}
for(int k = 1; k < macros.length; k++) { else { // replace the old value
macros[k] = parentMacros[k-1]; for(int k = 0; k < macros.length; k++) {
macros[k] = parentMacros[k];
}
macros[foundIndex] = macro;
} }
return macros; return macros;