From 2eaba453453b54785e6ee5e24919da761ecff2c5 Mon Sep 17 00:00:00 2001
From: Andy Herrick <herrick@openjdk.org>
Date: Fri, 19 Jun 2009 11:46:39 -0400
Subject: [PATCH] 6852646: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set

This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7

Reviewed-by: dgu, billyh
---
 jdk/make/common/shared/Defs-windows.gmk | 11 -----------
 jdk/make/common/shared/Sanity.gmk       |  5 +++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk
index 1c51cecccf2..f561e777970 100644
--- a/jdk/make/common/shared/Defs-windows.gmk
+++ b/jdk/make/common/shared/Defs-windows.gmk
@@ -647,17 +647,6 @@ ifeq ($(ARCH_DATA_MODEL), 32)
   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))
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
index 9ba2ae7037a..b260978266a 100644
--- a/jdk/make/common/shared/Sanity.gmk
+++ b/jdk/make/common/shared/Sanity.gmk
@@ -1588,10 +1588,11 @@ sane-kernel-vm:
 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