make/common/Release.gmk

*** 871,881 ****
  ifeq ($(PLATFORM), windows)
          $(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*.exe \
             -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
  else
          $(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
!         $(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \
              | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
  endif
  
  # Post process the image (strips and mcs on Elf files we are shipping)
  #   (Note the jdk WILL want the jre image before this processing)
--- 871,881 ----
  ifeq ($(PLATFORM), windows)
          $(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*.exe \
             -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
  else
          $(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
!         $(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
              | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
  endif
  
  # Post process the image (strips and mcs on Elf files we are shipping)
  #   (Note the jdk WILL want the jre image before this processing)
*** 1138,1150 ****
          $(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*.exe \
             -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" >> $@
  else
          $(RM) $@
          $(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
!         $(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*$(EXE_SUFFIX)` \
              | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
!         file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \
              | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
  endif
  
  # Post process the image (strips and mcs on files we are shipping)
  process-image-jdk:: $(JDK_BIN_LIST)
--- 1138,1150 ----
          $(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*.exe \
             -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" >> $@
  else
          $(RM) $@
          $(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
!         $(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
              | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
!         file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
              | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
  endif
  
  # Post process the image (strips and mcs on files we are shipping)
  process-image-jdk:: $(JDK_BIN_LIST)