diff --git a/make/common/shared/Defs-windows.gmk b/make/common/shared/Defs-windows.gmk index 1c51cecccf2573a9f00e805bc243122d13eee00c..f561e7779700cfd6eef5a25bd74f1256ca2fe09e 100644 --- a/make/common/shared/Defs-windows.gmk +++ b/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/make/common/shared/Sanity.gmk b/make/common/shared/Sanity.gmk index 9ba2ae7037a9da440ba71f96e28ac82ab522688b..b260978266a6fbf01abf914ee05400699ee9f88d 100644 --- a/make/common/shared/Sanity.gmk +++ b/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