From 505a3552fe19e6fc5d17402267a9b68f4cdd7369 Mon Sep 17 00:00:00 2001 From: Chris Recoskie Date: Fri, 10 Sep 2010 21:19:03 +0000 Subject: [PATCH] Bug 324816 - GnuMakefileGenerator does not properly handle tools which have more than one primary input type --- .../cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e43cddd176e..53985a8d38d 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 @@ -2910,7 +2910,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { allRes.add(re); } // 2. From InputTypes that other than the primary input type - if (type != tool.getPrimaryInputType()) { + if (!type.getPrimaryInput() && type != tool.getPrimaryInputType()) { String var = type.getBuildVariable(); if (var != null && var.length() > 0) { allRes.add(Path.fromOSString("$(" + type.getBuildVariable() + ")")); //$NON-NLS-1$ //$NON-NLS-2$