comparison make/Makefile @ 6021:744728c16316

7158067: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect product builds Summary: Build option FULL_DEBUG_SYMBOLS=0 only affects product builds. Reviewed-by: ohair, jmelvin, sspitsyn
author dcubed
date Tue, 03 Apr 2012 09:48:34 -0700
parents d652a62d6e03
children 74c359c4a9e5
comparison
equal deleted inserted replaced
6020:d652a62d6e03 6021:744728c16316
134 # Build or export docs 134 # Build or export docs
135 docs: 135 docs:
136 ifeq ($(OSNAME),windows) 136 ifeq ($(OSNAME),windows)
137 @$(ECHO) "No docs ($(VM_TARGET)) for windows" 137 @$(ECHO) "No docs ($(VM_TARGET)) for windows"
138 else 138 else
139 # We specify 'BUILD_FLAVOR=product' so that the proper
140 # ENABLE_FULL_DEBUG_SYMBOLS value is used.
139 $(CD) $(OUTPUTDIR); \ 141 $(CD) $(OUTPUTDIR); \
140 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 142 $(MAKE) -f $(ABS_OS_MAKEFILE) \
141 $(MAKE_ARGS) docs 143 $(MAKE_ARGS) BUILD_FLAVOR=product docs
142 endif 144 endif
143 145
144 # Build variation of hotspot 146 # Build variation of hotspot
145 $(C1_VM_TARGETS): 147 $(C1_VM_TARGETS):
146 $(CD) $(GAMMADIR)/make; \ 148 $(CD) $(GAMMADIR)/make; \
147 $(MAKE) VM_TARGET=$@ generic_build1 $(ALT_OUT) 149 $(MAKE) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
148 150
149 $(C2_VM_TARGETS): 151 $(C2_VM_TARGETS):
150 $(CD) $(GAMMADIR)/make; \ 152 $(CD) $(GAMMADIR)/make; \
151 $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT) 153 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
152 154
153 $(KERNEL_VM_TARGETS): 155 $(KERNEL_VM_TARGETS):
154 $(CD) $(GAMMADIR)/make; \ 156 $(CD) $(GAMMADIR)/make; \
155 $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT) 157 $(MAKE) BUILD_FLAVOR=$(@:%kernel=%) VM_TARGET=$@ \
158 generic_buildkernel $(ALT_OUT)
156 159
157 $(ZERO_VM_TARGETS): 160 $(ZERO_VM_TARGETS):
158 $(CD) $(GAMMADIR)/make; \ 161 $(CD) $(GAMMADIR)/make; \
159 $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT) 162 $(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \
163 generic_buildzero $(ALT_OUT)
160 164
161 $(SHARK_VM_TARGETS): 165 $(SHARK_VM_TARGETS):
162 $(CD) $(GAMMADIR)/make; \ 166 $(CD) $(GAMMADIR)/make; \
163 $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT) 167 $(MAKE) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ \
168 generic_buildshark $(ALT_OUT)
164 169
165 # Build compiler1 (client) rule, different for platforms 170 # Build compiler1 (client) rule, different for platforms
166 generic_build1: 171 generic_build1:
167 $(MKDIR) -p $(OUTPUTDIR) 172 $(MKDIR) -p $(OUTPUTDIR)
168 ifeq ($(OSNAME),windows) 173 ifeq ($(OSNAME),windows)
235 $(MAKE_ARGS) $(VM_TARGET) 240 $(MAKE_ARGS) $(VM_TARGET)
236 241
237 # Export file rule 242 # Export file rule
238 generic_export: $(EXPORT_LIST) 243 generic_export: $(EXPORT_LIST)
239 export_product: 244 export_product:
240 $(MAKE) VM_SUBDIR=product generic_export 245 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
246 generic_export
241 export_fastdebug: 247 export_fastdebug:
242 $(MAKE) VM_SUBDIR=fastdebug EXPORT_SUBDIR=/fastdebug generic_export 248 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
249 EXPORT_SUBDIR=/$(@:export_%=%) \
250 generic_export
243 export_debug: 251 export_debug:
244 $(MAKE) VM_SUBDIR=${VM_DEBUG} EXPORT_SUBDIR=/debug generic_export 252 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \
253 EXPORT_SUBDIR=/$(@:export_%=%) \
254 generic_export
245 export_optimized: 255 export_optimized:
246 $(MAKE) VM_SUBDIR=optimized EXPORT_SUBDIR=/optimized generic_export 256 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
257 EXPORT_SUBDIR=/$(@:export_%=%) \
258 generic_export
247 export_product_jdk:: 259 export_product_jdk::
248 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ 260 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
249 VM_SUBDIR=product generic_export 261 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
262 generic_export
250 export_optimized_jdk:: 263 export_optimized_jdk::
251 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ 264 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
252 VM_SUBDIR=optimized generic_export 265 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
266 generic_export
253 export_fastdebug_jdk:: 267 export_fastdebug_jdk::
254 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/fastdebug \ 268 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
255 VM_SUBDIR=fastdebug generic_export 269 VM_SUBDIR=$(@:export_%_jdk=%) \
270 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
271 generic_export
256 export_debug_jdk:: 272 export_debug_jdk::
257 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/debug \ 273 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \
258 VM_SUBDIR=${VM_DEBUG} generic_export 274 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
275 generic_export
259 276
260 # Export file copy rules 277 # Export file copy rules
261 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 278 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
262 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 279 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
263 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 280 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1