OpenJDK / jdk / hs
changeset 22272:4cbb04a368cb
8025936: Windows .pdb and .map files does not have proper dependencies setup
Reviewed-by: ihse, tbell
| author | erikj |
|---|---|
| date | Tue, 14 Jan 2014 12:05:46 +0100 |
| parents | c2c100e10ce6 |
| children | fea900443a4c |
| files | jdk/make/CompileLaunchers.gmk jdk/make/lib/CoreLibraries.gmk |
| diffstat | 2 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/CompileLaunchers.gmk Tue Jan 14 13:09:34 2014 +0100 +++ b/jdk/make/CompileLaunchers.gmk Tue Jan 14 12:05:46 2014 +0100 @@ -437,6 +437,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) UNPACKEXE_LANG := C++ endif +UNPACKEXE_DEBUG_SYMBOLS := true # On windows, unpack200 is linked completely differently to all other # executables, using the compiler with the compiler arguments. # It's also linked incrementally, producing a .ilk file that needs to @@ -445,6 +446,9 @@ BUILD_UNPACKEXE_LDEXE := $(CC) EXE_OUT_OPTION_save := $(EXE_OUT_OPTION) EXE_OUT_OPTION := -Fe + # With the current way unpack200 is built, debug symbols aren't supported + # anyway. + UNPACKEXE_DEBUG_SYMBOLS := endif $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \ @@ -474,7 +478,7 @@ -D "JDK_FNAME=unpack200.exe" \ -D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_FTYPE=0x1L", \ - DEBUG_SYMBOLS := true, \ + DEBUG_SYMBOLS := $(UNPACKEXE_DEBUG_SYMBOLS), \ MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest)) ifeq ($(OPENJDK_TARGET_OS), windows)
--- a/jdk/make/lib/CoreLibraries.gmk Tue Jan 14 13:09:34 2014 +0100 +++ b/jdk/make/lib/CoreLibraries.gmk Tue Jan 14 12:05:46 2014 +0100 @@ -310,16 +310,6 @@ BUILD_LIBRARIES += $(BUILD_LIBUNPACK) -ifeq ($(OPENJDK_TARGET_OS), windows) - $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK) - $(ECHO) Copying $(@F) - $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@ - - $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK) - $(ECHO) Copying $(@F) - $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@ -endif - ########################################################################################## BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin