Mercurial > hg > graal-jvmci-8

comparison make/windows/makefiles/defs.make @ 6096:fb8f9ab27c14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dcubed
date Thu, 24 May 2012 12:57:01 -0700
parents 4b37c0dafe3a
children 0d8e265ba727
comparison
equal deleted inserted replaced
6094:df84b4a3ebcb 6096:fb8f9ab27c14
141 _JUNK_ := $(shell \ 141 _JUNK_ := $(shell \
142 echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") 142 echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
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 ZIP_DEBUGINFO_FILES ?= 1
147 # failing in nightly when the debug info files are ZIP'ed.
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
154 else 147 else
155 ZIP_DEBUGINFO_FILES=0 148 ZIP_DEBUGINFO_FILES=0
156 endif 149 endif
157 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) 150 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
158 MAKE_ARGS += RM="$(RM)" 151 MAKE_ARGS += RM="$(RM)"