# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1263831337 0
# Node ID ab4f8683701c562d73e3903e37390f885eb9fc10
# Parent  d7a63891e2e6b45e7a5ef632abaa34ba7ad2edf0# Parent  005c5b5a8f94ce87785ed1da0d11aefa8f55b099
Merge

diff -r d7a63891e2e6 -r ab4f8683701c sbsv2/raptor/python/raptor_meta.py
--- a/sbsv2/raptor/python/raptor_meta.py	Mon Jan 18 00:22:30 2010 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py	Mon Jan 18 16:15:37 2010 +0000
@@ -2449,7 +2449,8 @@
 			key = str(detail['VARIANT_HRH']) \
 			 	+ str(detail['EPOCROOT']) \
 		    	+ detail['SYSTEMINCLUDE'] \
-		    	+ detail['PLATFORM']
+		    	+ detail['PLATFORM'] \
+		    	+ detail['PLATMACROS']
 
 		    # Keep a short version of the key for use in filenames.
 			uniq = hashlib.md5()
@@ -2485,11 +2486,7 @@
 			# Is this an unseen build platform?
 			# concatenate all the values we care about in a fixed order
 			# and use that as a signature for the platform.
-			items = ['PLATFORM', 'EPOCROOT', 'VARIANT_HRH', 'SYSTEMINCLUDE', 'TESTCODE']
-			if raptor_utilities.getOSPlatform().startswith("win"):
-				items.append('PLATMACROS.WINDOWS')
-			else:
-				items.append('PLATMACROS.LINUX')
+			items = ['PLATFORM', 'PLATMACROS', 'EPOCROOT', 'VARIANT_HRH', 'SYSTEMINCLUDE', 'TESTCODE']
 
 			items.extend(interfaces)
 			platform = ""