490 endif # !windows |
490 endif # !windows |
491 endif # !macosx |
491 endif # !macosx |
492 |
492 |
493 ifeq ($(ZIP_DEBUGINFO_FILES), true) |
493 ifeq ($(ZIP_DEBUGINFO_FILES), true) |
494 ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet |
494 ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet |
|
495 ifneq ($$($1_STRIP_POLICY), no_strip) |
495 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz |
496 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz |
496 |
497 |
497 ifeq ($(OPENJDK_TARGET_OS), windows) |
498 ifeq ($(OPENJDK_TARGET_OS), windows) |
498 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) |
499 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) |
499 $(CD) $$($1_OBJECT_DIR) \ |
500 $(CD) $$($1_OBJECT_DIR) \ |
502 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \ |
503 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \ |
503 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo |
504 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo |
504 $(CD) $$($1_OBJECT_DIR) \ |
505 $(CD) $$($1_OBJECT_DIR) \ |
505 && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo |
506 && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo |
506 endif |
507 endif |
|
508 endif # not possible when stripping is disabled |
507 endif # no MacOS X support yet |
509 endif # no MacOS X support yet |
508 else |
510 else |
509 ifeq ($(OPENJDK_TARGET_OS), windows) |
511 ifeq ($(OPENJDK_TARGET_OS), windows) |
510 $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ |
512 $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ |
511 $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb |
513 $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb |
582 endif # !windows |
584 endif # !windows |
583 endif # !macosx |
585 endif # !macosx |
584 |
586 |
585 ifeq ($(ZIP_DEBUGINFO_FILES), true) |
587 ifeq ($(ZIP_DEBUGINFO_FILES), true) |
586 ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet |
588 ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet |
|
589 ifneq ($$($1_STRIP_POLICY), no_strip) |
587 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz |
590 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz |
588 |
591 |
589 ifeq ($(OPENJDK_TARGET_OS), windows) |
592 ifeq ($(OPENJDK_TARGET_OS), windows) |
590 $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET) |
593 $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET) |
591 $(CD) $$($1_OBJECT_DIR) \ |
594 $(CD) $$($1_OBJECT_DIR) \ |
594 $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \ |
597 $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \ |
595 $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo |
598 $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo |
596 $(CD) $$($1_OBJECT_DIR) \ |
599 $(CD) $$($1_OBJECT_DIR) \ |
597 && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo |
600 && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo |
598 endif |
601 endif |
|
602 endif |
599 endif # no MacOS X support yet |
603 endif # no MacOS X support yet |
600 else |
604 else |
601 ifeq ($(OPENJDK_TARGET_OS), windows) |
605 ifeq ($(OPENJDK_TARGET_OS), windows) |
602 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ |
606 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ |
603 $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb |
607 $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb |