--- a/jdk/make/common/shared/Defs-versions.gmk Sat Dec 18 18:28:01 2010 -0800
+++ b/jdk/make/common/shared/Defs-versions.gmk Tue Dec 21 18:21:26 2010 -0800
@@ -27,7 +27,22 @@
# WARNING: This file is shared with other workspaces.
#
-# This file needs these set: CC_VERSION, PLATFORM, ARCH_FAMILY, and ARCH_DATA_MODEL.
+# This file needs these set: PLATFORM, ARCH_FAMILY, and ARCH_DATA_MODEL.
+
+# Windows uses Microsoft compilers by default
+ifeq ($(PLATFORM), windows)
+ override CC_VERSION = msvc
+endif
+
+# Solaris uses Sun Studio compilers by default
+ifeq ($(PLATFORM), solaris)
+ override CC_VERSION = sun
+endif
+
+# Linux uses GNU compilers by default
+ifeq ($(PLATFORM), linux)
+ override CC_VERSION = gcc
+endif
##########################################################################
#