comparison hotspot/make/Makefile @ 23507:b4339e4c239b

8033580: Old debug information in IMPORT_JDK is not removed Reviewed-by: dcubed, erikj
author ehelin
date Wed, 19 Mar 2014 14:35:38 +0100
parents 57aa8995d43b
children 7e8c3ace277d
comparison
equal deleted inserted replaced
39:699f2f8dafec 40:443afa7a6d4b
285 endif 285 endif
286 else 286 else
287 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true." 287 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true."
288 endif 288 endif
289 289
290 remove_old_debuginfo:
291 ifeq ($(JVM_VARIANT_CLIENT), true)
292 ifeq ($(ZIP_DEBUGINFO_FILES),1)
293 ifeq ($(OSNAME), windows)
294 $(RM) -f $(EXPORT_CLIENT_DIR)/jvm.map $(EXPORT_CLIENT_DIR)/jvm.pdb
295 else
296 $(RM) -f $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
297 endif
298 else
299 $(RM) -f $(EXPORT_CLIENT_DIR)/libjvm.diz
300 endif
301 endif
302 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
303 ifeq ($(ZIP_DEBUGINFO_FILES),1)
304 ifeq ($(OSNAME), windows)
305 $(RM) -f $(EXPORT_SERVER_DIR)/jvm.map $(EXPORT_SERVER_DIR)/jvm.pdb
306 else
307 ifeq ($(OS_VENDOR), Darwin)
308 $(RM) -rf $(EXPORT_SERVER_DIR)/libjvm.dylib.dSYM
309 else
310 $(RM) -f $(EXPORT_SERVER_DIR)/libjvm.debuginfo
311 endif
312 endif
313 else
314 $(RM) -f $(EXPORT_SERVER_DIR)/libjvm.diz
315 endif
316 endif
317 ifeq ($(JVM_VARIANT_MINIMAL1),true)
318 ifeq ($(ZIP_DEBUGINFO_FILES),1)
319 $(RM) -f $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
320 else
321 $(RM) -f $(EXPORT_MINIMAL_DIR)/libjvm.diz
322 endif
323 endif
324
290 # Export file rule 325 # Export file rule
291 generic_export: $(EXPORT_LIST) 326 generic_export: $(EXPORT_LIST) remove_old_debuginfo
292 327
293 export_product: 328 export_product:
294 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export 329 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
295 export_fastdebug: 330 export_fastdebug:
296 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export 331 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
839 generic_build1 generic_build2 generic_buildminimal1 generic_export \ 874 generic_build1 generic_build2 generic_buildminimal1 generic_export \
840 export_product export_fastdebug export_debug export_optimized \ 875 export_product export_fastdebug export_debug export_optimized \
841 export_jdk_product export_jdk_fastdebug export_jdk_debug \ 876 export_jdk_product export_jdk_fastdebug export_jdk_debug \
842 create_jdk copy_jdk update_jdk test_jdk \ 877 create_jdk copy_jdk update_jdk test_jdk \
843 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk \ 878 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk \
844 $(HS_ALT_MAKE)/Makefile.make 879 $(HS_ALT_MAKE)/Makefile.make remove_old_debuginfo