diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java
index eab56f847ce..8bb37d4370f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java
@@ -198,6 +198,25 @@ public class DefaultGCCDependencyCalculator implements IManagedDependencyGenerat
 			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(resource.getLocation(),
+                                        null, null, info
+                                                .getDefaultConfiguration()
+                                                .getToolChain()));
+                if ((resolvedCommand = resolvedCommand.trim()).length() > 0)
+                    buildCmd = resolvedCommand;
+
+            } catch (BuildMacroException e) {
+            }
 		}
 
 		buffer.append(IManagedBuilderMakefileGenerator.TAB + 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 1bbc6d978fa..631f1229090 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -2346,6 +2346,28 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
 				if( cmdLInfo == null ) buildCmd = cmd + WHITESPACE + buildFlags + WHITESPACE + 
 						outflag + WHITESPACE + outputPrefix + OUT_MACRO + otherPrimaryOutputs + WHITESPACE + IN_MACRO;
 				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 + buildCmd);
 			}