From 3460bc971fc5de602cddef0a2f2bfd9ff23ea8f2 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Thu, 25 May 2006 15:37:33 +0000 Subject: [PATCH] Make user-defined includes and symbols appear first in the path entry list. The current order is: 1. User values defined via options 2. User values defined via environment 3. Tool built-ins --- .../internal/scannerconfig/ManagedBuildCPathEntryContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildCPathEntryContainer.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildCPathEntryContainer.java index 6393590b6d4..a1b63a2c0f0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildCPathEntryContainer.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildCPathEntryContainer.java @@ -189,9 +189,9 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer { mCollector.setProject(project); ManagedBuildCPathEntryContainer.outputTrace(project.getName(), "Path entries collected dynamically"); //$NON-NLS-1$ calculateEntriesDynamically((IProject)info.getOwner(), profileInstance, collector); + addEntries(info.getManagedBuildValues()); addIncludePaths(mCollector.getIncludePaths()); addDefinedSymbols(mCollector.getDefinedSymbols()); - addEntries(info.getManagedBuildValues()); } else { // If none supplied, use the built-ins if (defaultConfig != null) {