From 297e4e1de8d46f3a9ecf40cb757976ecce9908e3 Mon Sep 17 00:00:00 2001
From: James Blackburn <jamesblackburn+eclipse@gmail.com>
Date: Tue, 23 Feb 2010 13:25:22 +0000
Subject: [PATCH] Bug 100844 ICSettingEntry.LIBRARY_FILE not currently
 contributed back to core model as the lib names exported by the build system
 aren't absolute paths & hence can't be resolved.

---
 .../model/util/PathEntryTranslator.java         | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java
index 8c5f556c146..a2002344bc0 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java
@@ -758,14 +758,17 @@ public class PathEntryTranslator {
 						return result;
 					}
 				case ICSettingEntry.LIBRARY_PATH:
+				case ICSettingEntry.LIBRARY_FILE:
+					// Bug 100844 don't contribute library files back to the CModel as a library files, as supplied by the build system,
+					// aren't currently resolved
 					return null;
-				case ICSettingEntry.LIBRARY_FILE:{
-						IPath paths[][] = getEntryPath(fLangEntry, cfg);
-						result = new IPathEntry[paths[0].length];
-						for (int i=0; i<result.length; i++)
-							result[i] = CoreModel.newLibraryEntry(path, paths[0][i], paths[1][i], null, null, null, fIsExported);
-						return result;
-					}
+//				case ICSettingEntry.LIBRARY_FILE:{
+//						IPath paths[][] = getEntryPath(fLangEntry, cfg);
+//						result = new IPathEntry[paths[0].length];
+//						for (int i=0; i<result.length; i++)
+//							result[i] = CoreModel.newLibraryEntry(path, paths[0][i], paths[1][i], null, null, null, fIsExported);
+//						return result;
+//					}
 				case ICSettingEntry.OUTPUT_PATH:
 					result = new IPathEntry[1];
 					result[0] = CoreModel.newOutputEntry(fPath, getExclusionPatterns());