changeset 3350:4b37c0dafe3a

7170010: conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows Summary: Always disable ZIP_DEBUGINFO_FILES on Windows. Reviewed-by: acorn
author dcubed
date Fri, 18 May 2012 09:15:15 -0700
parents 198dcc84088c
children cee14a6fc5ac 960a442eae91
files make/windows/makefiles/defs.make
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/windows/makefiles/defs.make	Wed May 16 12:47:27 2012 -0700
+++ b/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