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

crecoskie Oct 17, 2005

Browse source 
- missed a couple of code paths with the macro support fixes for 111203
This commit is contained in:
Chris Recoskie 2005-10-17 18:09:00 +00:00
parent 88dc548a51
commit 79e643ba6d
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java
View file

@ -198,6 +198,25 @@ public class DefaultGCCDependencyCalculator implements IManagedDependencyGenerat
else { else {
buildCmd = cmdLInfo.getCommandLine(); buildCmd = cmdLInfo.getCommandLine();
} }
// resolve any remaining macros in the command after it has been
// generated
try {
String resolvedCommand = ManagedBuildManager
.getBuildMacroProvider().resolveValueToMakefileFormat(
buildCmd,
EMPTY_STRING,
WHITESPACE,
IBuildMacroProvider.CONTEXT_FILE,
new FileContextData(resource.getLocation(),
null, null, info
.getDefaultConfiguration()
.getToolChain()));
if ((resolvedCommand = resolvedCommand.trim()).length() > 0)
buildCmd = resolvedCommand;
} catch (BuildMacroException e) {
}
} }
buffer.append(IManagedBuilderMakefileGenerator.TAB + buffer.append(IManagedBuilderMakefileGenerator.TAB +

22
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
View file

@ -2346,6 +2346,28 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
if( cmdLInfo == null ) buildCmd = cmd + WHITESPACE + buildFlags + WHITESPACE + if( cmdLInfo == null ) buildCmd = cmd + WHITESPACE + buildFlags + WHITESPACE +
outflag + WHITESPACE + outputPrefix + OUT_MACRO + otherPrimaryOutputs + WHITESPACE + IN_MACRO; outflag + WHITESPACE + outputPrefix + OUT_MACRO + otherPrimaryOutputs + WHITESPACE + IN_MACRO;
else buildCmd = cmdLInfo.getCommandLine(); else buildCmd = cmdLInfo.getCommandLine();
// resolve any remaining macros in the command after it has been
// generated
try {
String resolvedCommand = ManagedBuildManager
.getBuildMacroProvider()
.resolveValueToMakefileFormat(
buildCmd,
EMPTY_STRING,
WHITESPACE,
IBuildMacroProvider.CONTEXT_FILE,
new FileContextData(sourceLocation,
outputLocation, null, info
.getDefaultConfiguration()
.getToolChain()));
if ((resolvedCommand = resolvedCommand.trim()).length() > 0)
buildCmd = resolvedCommand;
} catch (BuildMacroException e) {
}
buffer.append(TAB + AT + ECHO + WHITESPACE + buildCmd + NEWLINE); buffer.append(TAB + AT + ECHO + WHITESPACE + buildCmd + NEWLINE);
buffer.append(TAB + AT + buildCmd); buffer.append(TAB + AT + buildCmd);
} }