make/solaris/makefiles/defs.make

*** 120,129 ****
--- 120,130 ----
      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)
        ifneq ($(OBJCOPY),)
          # OBJCOPY version check:
          # - version number is last blank separate word on first line
          # - version number formats that have been seen:
          #   - <major>.<minor>
*** 172,181 ****
--- 173,183 ----
        endif
  
        ifeq ($(OBJCOPY),)
          $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files."))
          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."))
  
          # Library stripping policies for .debuginfo configs:
*** 194,203 ****
--- 196,206 ----
  
          ZIP_DEBUGINFO_FILES ?= 1
  
          $(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=solaris
  
*** 206,216 ****
  
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  
  # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
  EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
      EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
    else
      EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.debuginfo
    endif
--- 209,219 ----
  
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  
  # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
  EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
! ifeq ($(COPY_DEBUG_SYMBOLS),true)
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
      EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
    else
      EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.debuginfo
    endif
*** 226,236 ****
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
    ifeq ($(ARCH_DATA_MODEL),32)
      EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
      EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
    endif
!   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.diz
        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.diz
        ifeq ($(ARCH_DATA_MODEL),32)
--- 229,239 ----
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
    ifeq ($(ARCH_DATA_MODEL),32)
      EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
      EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
    endif
!   ifeq ($(COPY_DEBUG_SYMBOLS),true)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.diz
        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.diz
        ifeq ($(ARCH_DATA_MODEL),32)
*** 255,265 ****
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
    ifeq ($(ARCH_DATA_MODEL),32)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
    endif
!   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.diz
        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.diz
        ifeq ($(ARCH_DATA_MODEL),32)
--- 258,268 ----
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
    ifeq ($(ARCH_DATA_MODEL),32)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
    endif
!   ifeq ($(COPY_DEBUG_SYMBOLS),true)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.diz
        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.diz
        ifeq ($(ARCH_DATA_MODEL),32)