make/bsd/makefiles/defs.make

*** 203,216 ****
--- 203,218 ----
        ifneq ($(ALT_OBJCOPY),)
          $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
          OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
        endif
  
+       ifeq ($(COPY_DEBUG_SYMBOLS), true)
          ifeq ($(OBJCOPY),)
            $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo" \
                "files. You may need to set ALT_OBJCOPY."))
            ENABLE_FULL_DEBUG_SYMBOLS=0
+           COPY_DEBUG_SYMBOLS=false
            $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
          else
            $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo" \
                "files."))
  
*** 234,243 ****
--- 236,246 ----
            ZIP_DEBUGINFO_FILES ?= 1
          endif
  
          $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
        endif
+     endif # COPY_DEBUG_SYMBOLS=true
    endif # ENABLE_FULL_DEBUG_SYMBOLS=1
  endif # BUILD_FLAVOR
  
  JDK_INCLUDE_SUBDIR=bsd
  
*** 259,269 ****
  ifneq ($(STATIC_BUILD),true)
    # client and server subdirectories have symbolic links to ../libjsig.so
    EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
  endif
  
! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
    else
      ifeq ($(OS_VENDOR), Darwin)
          EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
--- 262,272 ----
  ifneq ($(STATIC_BUILD),true)
    # client and server subdirectories have symbolic links to ../libjsig.so
    EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
  endif
  
! ifeq ($(COPY_DEBUG_SYMBOLS),true)
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
    else
      ifeq ($(OS_VENDOR), Darwin)
          EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
*** 282,292 ****
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
    ifeq ($(STATIC_BUILD),true)
      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.symbols
    endif
  
!   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
          EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
      else
        ifeq ($(OS_VENDOR), Darwin)
            EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
--- 285,295 ----
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
    ifeq ($(STATIC_BUILD),true)
      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.symbols
    endif
  
!   ifeq ($(COPY_DEBUG_SYMBOLS),true)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
          EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
      else
        ifeq ($(OS_VENDOR), Darwin)
            EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
*** 302,312 ****
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
    ifeq ($(STATIC_BUILD),true)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.symbols
    endif
  
!   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
          EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
      else
        ifeq ($(OS_VENDOR), Darwin)
            EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
--- 305,315 ----
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
    ifeq ($(STATIC_BUILD),true)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.symbols
    endif
  
!   ifeq ($(COPY_DEBUG_SYMBOLS),true)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
          EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
      else
        ifeq ($(OS_VENDOR), Darwin)
            EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
*** 364,374 ****
        UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.symbols
        UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.symbols
        UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/minimal/libjvm.symbols
      endif
  
!     ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
        ifeq ($(ZIP_DEBUGINFO_FILES),1)
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz
        else
--- 367,377 ----
        UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.symbols
        UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.symbols
        UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/minimal/libjvm.symbols
      endif
  
!     ifeq ($(COPY_DEBUG_SYMBOLS),true)
        ifeq ($(ZIP_DEBUGINFO_FILES),1)
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz
        else