Mercurial > hg > truffle
comparison make/windows/makefiles/defs.make @ 6082: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 | fb8f9ab27c14 |
comparison
equal
deleted
inserted
replaced
6081:198dcc84088c | 6082:4b37c0dafe3a |
---|---|
143 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) | 143 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) |
144 | 144 |
145 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) | 145 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
146 # Disable ZIP_DEBUGINFO_FILES by default because various tests are | 146 # Disable ZIP_DEBUGINFO_FILES by default because various tests are |
147 # failing in nightly when the debug info files are ZIP'ed. | 147 # failing in nightly when the debug info files are ZIP'ed. |
148 ZIP_DEBUGINFO_FILES ?= 0 | 148 #ZIP_DEBUGINFO_FILES ?= 0 |
149 # The above conditional setting logic is unreliable on Windows for | |
150 # unknown reasons. We force ZIP_DEBUGINFO_FILES to be disabled on | |
151 # Windows until we figure out why the various tests are failing | |
152 # AND why the conditional setting logic is unreliable. | |
153 ZIP_DEBUGINFO_FILES=0 | |
149 else | 154 else |
150 ZIP_DEBUGINFO_FILES=0 | 155 ZIP_DEBUGINFO_FILES=0 |
151 endif | 156 endif |
152 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) | 157 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) |
153 MAKE_ARGS += RM="$(RM)" | 158 MAKE_ARGS += RM="$(RM)" |