Mercurial > hg > openjdk > jdk8u
changeset 2364:5af73acc6b6c jdk8u212-b01 jdk8u222-b00
8220397: REGRESSION: JDK-8036003 backport regresses no_strip builds
Summary: 8036003 adds STRIP_POLICY=no_strip conditionals in some areas, but not for ZIP_DEBUGINFO_FILES blocks
Reviewed-by: erikj
author | andrew |
---|---|
date | Fri, 15 Mar 2019 17:19:15 +0000 |
parents | ad9bf02e0bf7 |
children | 5dd7e8d925e8 6857b11f17b1 |
files | make/common/NativeCompilation.gmk |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/NativeCompilation.gmk Thu Mar 14 01:06:50 2019 +0000 +++ b/make/common/NativeCompilation.gmk Fri Mar 15 17:19:15 2019 +0000 @@ -492,6 +492,7 @@ ifeq ($(ZIP_DEBUGINFO_FILES), true) ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +ifneq ($$($1_STRIP_POLICY), no_strip) $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz ifeq ($(OPENJDK_TARGET_OS), windows) @@ -504,6 +505,7 @@ $(CD) $$($1_OBJECT_DIR) \ && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo endif +endif # not possible when stripping is disabled endif # no MacOS X support yet else ifeq ($(OPENJDK_TARGET_OS), windows) @@ -584,6 +586,7 @@ ifeq ($(ZIP_DEBUGINFO_FILES), true) ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +ifneq ($$($1_STRIP_POLICY), no_strip) $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz ifeq ($(OPENJDK_TARGET_OS), windows) @@ -596,6 +599,7 @@ $(CD) $$($1_OBJECT_DIR) \ && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo endif +endif endif # no MacOS X support yet else ifeq ($(OPENJDK_TARGET_OS), windows)