changeset 1434:4f207797e185

6852646: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set. Summary: This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7 Reviewed-by: dgu, billyh
author herrick
date Fri, 19 Jun 2009 11:46:39 -0400
parents ea7620b05a58
children 23c7d780c1b3
files make/common/shared/Defs-windows.gmk make/common/shared/Sanity.gmk
diffstat 2 files changed, 3 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-windows.gmk	Mon Jun 15 13:08:29 2009 -0400
+++ b/make/common/shared/Defs-windows.gmk	Fri Jun 19 11:46:39 2009 -0400
@@ -647,17 +647,6 @@
   HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
 endif
 
-# HOTSPOT_KERNEL_PATH: location of kernel jvm library file.
-ifeq ($(ARCH_DATA_MODEL), 32)
-  ifdef ALT_HOTSPOT_KERNEL_PATH
-    HOTSPOT_KERNEL_PATH :=$(call FullPath,$(ALT_HOTSPOT_KERNEL_PATH))
-  else
-    HOTSPOT_KERNEL_PATH   =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/kernel
-  endif
-  HOTSPOT_KERNEL_PATH:=$(call AltCheckSpaces,HOTSPOT_KERNEL_PATH)
-  HOTSPOT_KERNEL_PATH:=$(call AltCheckValue,HOTSPOT_KERNEL_PATH)
-endif
-
 # HOTSPOT_SERVER_PATH: location of server jvm library file.
 ifdef ALT_HOTSPOT_SERVER_PATH
   HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
--- a/make/common/shared/Sanity.gmk	Mon Jun 15 13:08:29 2009 -0400
+++ b/make/common/shared/Sanity.gmk	Fri Jun 19 11:46:39 2009 -0400
@@ -1588,10 +1588,11 @@
 ifeq ($(PLATFORM), windows)
   ifeq ($(ARCH_DATA_MODEL), 32)
 	@if [ ! -r $(HOTSPOT_KERNEL_PATH)/jvm.dll ]; then \
-	    $(ECHO) "ERROR: Your HOTSPOT_IMPORT_PATH does not include a Kernel VM... \n" \
+	    $(ECHO) "WARNING: Your HOTSPOT_IMPORT_PATH does not include a Kernel VM... \n" \
+		    "     The kernel installer may not be built (unless hotspot is also). \n" \
 		    "     $(HOTSPOT_KERNEL_PATH)/jvm.dll \n" \
 		    "     Please check the value of ALT_HOTSPOT_IMPORT_PATH. \n" \
-		    >> $(ERROR_FILE) ; \
+		    >> $(WARNING_FILE) ; \
 	fi
   endif
 endif