common/makefiles/NativeCompilation.gmk

*** 449,465 ****
                      $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
                                          $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
                          $(RM) $$@
                          $(FIX_EMPTY_SEC_HDR_FLAGS) $$<
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(ADD_GNU_DEBUGLINK) $$@ $$<
                  else # not solaris
                      $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
                          $(RM) $$@
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(OBJCOPY) --add-gnu-debuglink=$$@ $$<
!                 endif
  
                  ifeq ($(ZIP_DEBUGINFO_FILES), 1)
                      $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
  
                      ifeq ($(OPENJDK_TARGET_OS), windows)
--- 449,466 ----
                      $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
                                          $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
                          $(RM) $$@
                          $(FIX_EMPTY_SEC_HDR_FLAGS) $$<
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $$(@F) $$<
                  else # not solaris
                      $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
                          $(RM) $$@
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
!                 endif # Touch to not retrigger rule on rebuild
!                         $(TOUCH) $$@
  
                  ifeq ($(ZIP_DEBUGINFO_FILES), 1)
                      $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
  
                      ifeq ($(OPENJDK_TARGET_OS), windows)
*** 524,540 ****
                      $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
                                          $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
                          $(RM) $$@
                          $(FIX_EMPTY_SEC_HDR_FLAGS) $$<
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(ADD_GNU_DEBUGLINK) $$@ $$<
                  else # not solaris
                      $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
                          $(RM) $$@
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(OBJCOPY) --add-gnu-debuglink=$$@ $$<
                  endif
  
                  ifeq ($(ZIP_DEBUGINFO_FILES), 1)
                      $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
  
                      ifeq ($(OPENJDK_TARGET_OS), windows)
--- 525,542 ----
                      $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
                                          $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
                          $(RM) $$@
                          $(FIX_EMPTY_SEC_HDR_FLAGS) $$<
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $$(@F) $$<
                  else # not solaris
                      $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
                          $(RM) $$@
                          $(OBJCOPY) --only-keep-debug $$< $$@
!                         $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
                  endif
+                         $(TOUCH) $$@
  
                  ifeq ($(ZIP_DEBUGINFO_FILES), 1)
                      $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
  
                      ifeq ($(OPENJDK_TARGET_OS), windows)