Mercurial > hg > graal-jvmci-8
comparison make/windows/makefiles/defs.make @ 6932:857f3ce858dd
8002034: Allow Full Debug Symbols when cross-compiling
8001756: Hotspot makefiles report missing OBJCOPY command in the wrong circumstances
Reviewed-by: dcubed, dsamersoff, erikj, collins
author | dholmes |
---|---|
date | Mon, 05 Nov 2012 19:33:44 -0500 |
parents | fb19af007ffc |
children | 8b46b0196eb0 |
comparison
equal
deleted
inserted
replaced
6931:ca8168203393 | 6932:857f3ce858dd |
---|---|
129 # up by different parts of the build. Just to be clear, we only need | 129 # up by different parts of the build. Just to be clear, we only need |
130 # two variable names because the incoming option value can be | 130 # two variable names because the incoming option value can be |
131 # overridden in some situations, e.g., a BUILD_FLAVOR != product | 131 # overridden in some situations, e.g., a BUILD_FLAVOR != product |
132 # build. | 132 # build. |
133 | 133 |
134 ifeq ($(BUILD_FLAVOR), product) | 134 # Due to the multiple sub-make processes that occur this logic gets |
135 FULL_DEBUG_SYMBOLS ?= 1 | 135 # executed multiple times. We reduce the noise by at least checking that |
136 ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) | 136 # BUILD_FLAVOR has been set. |
137 else | 137 ifneq ($(BUILD_FLAVOR),) |
138 # debug variants always get Full Debug Symbols (if available) | 138 ifeq ($(BUILD_FLAVOR), product) |
139 ENABLE_FULL_DEBUG_SYMBOLS = 1 | 139 FULL_DEBUG_SYMBOLS ?= 1 |
140 endif | 140 ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) |
141 _JUNK_ := $(shell \ | 141 else |
142 echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") | 142 # debug variants always get Full Debug Symbols (if available) |
143 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) | 143 ENABLE_FULL_DEBUG_SYMBOLS = 1 |
144 | 144 endif |
145 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) | 145 _JUNK_ := $(shell \ |
146 ZIP_DEBUGINFO_FILES ?= 1 | 146 echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") |
147 else | 147 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) |
148 ZIP_DEBUGINFO_FILES=0 | 148 |
149 endif | 149 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
150 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) | 150 ZIP_DEBUGINFO_FILES ?= 1 |
151 else | |
152 ZIP_DEBUGINFO_FILES=0 | |
153 endif | |
154 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) | |
155 endif | |
156 | |
151 MAKE_ARGS += RM="$(RM)" | 157 MAKE_ARGS += RM="$(RM)" |
152 MAKE_ARGS += ZIPEXE=$(ZIPEXE) | 158 MAKE_ARGS += ZIPEXE=$(ZIPEXE) |
153 | 159 |
154 # On 32 bit windows we build server, client and kernel, on 64 bit just server. | 160 # On 32 bit windows we build server, client and kernel, on 64 bit just server. |
155 ifeq ($(JVM_VARIANTS),) | 161 ifeq ($(JVM_VARIANTS),) |