make/Images.gmk

*** 142,152 ****
          $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
              -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \
        )
  
    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
!     ifeq ($(OPENJDK_TARGET_OS), macosx)
        DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES))
      else
        DEMO_FILES := $(filter-out %.debuginfo %.pdb %.map, $(DEMO_FILES))
      endif
    endif
--- 142,152 ----
          $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
              -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \
        )
  
    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
!     ifeq ($(call isTargetOs, macosx), true)
        DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES))
      else
        DEMO_FILES := $(filter-out %.debuginfo %.pdb %.map, $(DEMO_FILES))
      endif
    endif
*** 190,200 ****
  
  ALL_JDK_MODULES := $(JDK_MODULES)
  ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
      $(call FindTransitiveDepsForModule, $m)))
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBS_TARGET_SUBDIR := bin
  else
    LIBS_TARGET_SUBDIR := lib
  endif
  
--- 190,200 ----
  
  ALL_JDK_MODULES := $(JDK_MODULES)
  ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
      $(call FindTransitiveDepsForModule, $m)))
  
! ifeq ($(call isTargetOs, windows), true)
    LIBS_TARGET_SUBDIR := bin
  else
    LIBS_TARGET_SUBDIR := lib
  endif
  
*** 209,219 ****
    DEBUGINFO_SUFFIXES += .diz
  else
    DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
    # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
    # dirs.
!   ifeq ($(OPENJDK_TARGET_OS), macosx)
      $(eval $(call FillCacheFind, \
          $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
      FindDebuginfoFiles = \
          $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
    endif
--- 209,219 ----
    DEBUGINFO_SUFFIXES += .diz
  else
    DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
    # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
    # dirs.
!   ifeq ($(call isTargetOs, macosx), true)
      $(eval $(call FillCacheFind, \
          $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
      FindDebuginfoFiles = \
          $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
    endif