259 IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) |
259 IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) |
260 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
260 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
261 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
261 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
262 # the import JDK may not contain the target of the symlink |
262 # the import JDK may not contain the target of the symlink |
263 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),) |
263 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),) |
264 # check for the .diz file, but create the .debuginfo link |
264 IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DIZ_NAME) |
265 IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) |
|
266 endif |
265 endif |
267 else |
266 else |
268 # the import JDK may not contain the target of the symlink |
267 # the import JDK may not contain the target of the symlink |
269 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),) |
268 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),) |
270 IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) |
269 IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) |
317 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) |
316 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) |
318 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
317 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
319 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
318 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
320 # the import JDK may not contain the target of the symlink |
319 # the import JDK may not contain the target of the symlink |
321 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),) |
320 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),) |
322 # check for the .diz file, but create the .debuginfo link |
321 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME) |
323 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) |
|
324 endif |
322 endif |
325 else |
323 else |
326 # the import JDK may not contain the target of the symlink |
324 # the import JDK may not contain the target of the symlink |
327 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),) |
325 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),) |
328 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) |
326 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) |
470 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME): |
468 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME): |
471 @$(prep-target) |
469 @$(prep-target) |
472 $(call install-sym-link, ../$(LIBJSIG_NAME)) |
470 $(call install-sym-link, ../$(LIBJSIG_NAME)) |
473 |
471 |
474 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
472 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
475 # we don't create a symlink to a libjsig.diz file |
473 # We don't create a symlink to a libjsig.diz file, but we do put |
|
474 # the libjsig.debuginfo symlink into a libjsig.diz file. The aurora |
|
475 # system does not like dangling symlinks. |
|
476 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
|
477 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME) \ |
|
478 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DIZ_NAME): |
|
479 @$(prep-target) |
|
480 $(LN) -s ../$(LIBJSIG_DEBUGINFO_NAME) $(@D)/$(LIBJSIG_DEBUGINFO_NAME) |
|
481 ( $(CD) $(@D) ; \ |
|
482 $(ZIPEXE) -y $(LIBJSIG_DIZ_NAME) $(LIBJSIG_DEBUGINFO_NAME) ; \ |
|
483 $(RM) $(LIBJSIG_DEBUGINFO_NAME) ; \ |
|
484 ) |
|
485 else |
476 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) \ |
486 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) \ |
477 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME): |
487 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME): |
478 @$(prep-target) |
488 @$(prep-target) |
479 $(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME)) |
489 $(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME)) |
|
490 endif |
480 endif |
491 endif |
481 else |
492 else |
482 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME): |
493 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME): |
483 @$(prep-target) |
494 @$(prep-target) |
484 $(call install-sym-link, ../$(LIBJSIG_NAME)) |
495 $(call install-sym-link, ../$(LIBJSIG_NAME)) |
485 |
496 |
486 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
497 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
487 # we don't create a symlink to a libjsig.diz file |
498 # We don't create a symlink to a libjsig.diz file, but we do put |
|
499 # the libjsig.debuginfo symlink into a libjsig.diz file. The aurora |
|
500 # system does not like dangling symlinks. |
|
501 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
|
502 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME): |
|
503 @$(prep-target) |
|
504 $(LN) -s ../$(LIBJSIG_DEBUGINFO_NAME) $(@D)/$(LIBJSIG_DEBUGINFO_NAME) |
|
505 ( $(CD) $(@D) ; \ |
|
506 $(ZIPEXE) -y $(LIBJSIG_DIZ_NAME) $(LIBJSIG_DEBUGINFO_NAME) ; \ |
|
507 $(RM) $(LIBJSIG_DEBUGINFO_NAME) ; \ |
|
508 ) |
|
509 else |
488 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME): |
510 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME): |
489 @$(prep-target) |
511 @$(prep-target) |
490 $(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME)) |
512 $(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME)) |
|
513 endif |
491 endif |
514 endif |
492 endif |
515 endif |
493 |
516 |
494 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME) |
517 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME) |
495 $(install-import-file) |
518 $(install-import-file) |