make/launcher/Launcher-jdk.pack.gmk

rev 52916 : 8210459: Add support for generating compile_commands.json
Reviewed-by: andrew

*** 84,106 ****
      CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \
      CFLAGS_release := -DPRODUCT, \
      CFLAGS_linux := -fPIC, \
      CFLAGS_solaris := -KPIC, \
      CFLAGS_macosx := -fPIC, \
!     LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
!         $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \
      MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
      MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
  ))
  
- ifneq ($(USE_EXTERNAL_LIBZ), true)
- 
-   $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
- 
- endif
- 
  TARGETS += $(BUILD_UNPACKEXE)
  
  ################################################################################
--- 84,100 ----
      CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \
      CFLAGS_release := -DPRODUCT, \
      CFLAGS_linux := -fPIC, \
      CFLAGS_solaris := -KPIC, \
      CFLAGS_macosx := -fPIC, \
!     LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \
      MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
      MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
+     EXTRA_OBJECT_FILES := $(UNPACKEXE_ZIPOBJS) \
  ))
  
  TARGETS += $(BUILD_UNPACKEXE)
  
  ################################################################################