# HG changeset patch
# User dcubed
# Date 1337357715 25200
# Node ID 98520449d94c82d0cdc35c1bad8c5ff9effb60aa
# Parent  ebf1dbf96b24bf499716bc450d934e9a4b22da45
7170010: conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows
Summary: Always disable ZIP_DEBUGINFO_FILES on Windows.
Reviewed-by: acorn

diff -r ebf1dbf96b24 -r 98520449d94c hotspot/make/windows/makefiles/defs.make
--- a/hotspot/make/windows/makefiles/defs.make	Wed May 16 12:47:27 2012 -0700
+++ b/hotspot/make/windows/makefiles/defs.make	Fri May 18 09:15:15 2012 -0700
@@ -145,7 +145,12 @@
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
   # Disable ZIP_DEBUGINFO_FILES by default because various tests are
   # failing in nightly when the debug info files are ZIP'ed.
-  ZIP_DEBUGINFO_FILES ?= 0
+  #ZIP_DEBUGINFO_FILES ?= 0
+  # The above conditional setting logic is unreliable on Windows for
+  # unknown reasons. We force ZIP_DEBUGINFO_FILES to be disabled on
+  # Windows until we figure out why the various tests are failing
+  # AND why the conditional setting logic is unreliable.
+  ZIP_DEBUGINFO_FILES=0
 else
   ZIP_DEBUGINFO_FILES=0
 endif