# HG changeset patch
# User timkelly
# Date 1260807852 21600
# Node ID 4224161eb5db5088aa1b4149dde4c09785bdf92d
# Parent  9e29549b331ddcc32b05fec67a736cdc31588bbc
merge commit

diff -r 9e29549b331d -r 4224161eb5db builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Mon Dec 14 10:22:37 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Mon Dec 14 10:24:12 2009 -0600
@@ -228,7 +228,13 @@
 		if (oemDir.exists()) {
 			includeEntries.add(new CIncludePathEntry(new Path(oemDir.getAbsolutePath()), 0));
 		}
-
+		
+		// add the compiler include
+		IPath compilerPrefixPath = carbideBuildConfig.getCompilerPrefixFile();
+		if (compilerPrefixPath != null){
+			includeEntries.add(new CIncludePathEntry(new Path(compilerPrefixPath.removeLastSegments(1).toOSString()), 0));
+		}
+		
 		// cache the macros
 		macroEntries = new ArrayList<ICLanguageSettingEntry>(0);