8220397: REGRESSION: JDK-8036003 backport regresses no_strip builds jdk8u212-b01 jdk8u222-b00

Fri, 15 Mar 2019 17:19:15 +0000

author
andrew
date
Fri, 15 Mar 2019 17:19:15 +0000
changeset 2403
5af73acc6b6c
parent 2402
ad9bf02e0bf7
child 2404
5dd7e8d925e8
child 2416
6857b11f17b1

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

make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/make/common/NativeCompilation.gmk	Thu Mar 14 01:06:50 2019 +0000
     1.2 +++ b/make/common/NativeCompilation.gmk	Fri Mar 15 17:19:15 2019 +0000
     1.3 @@ -492,6 +492,7 @@
     1.4  
     1.5          ifeq ($(ZIP_DEBUGINFO_FILES), true)
     1.6  ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
     1.7 +ifneq ($$($1_STRIP_POLICY), no_strip)
     1.8            $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
     1.9  
    1.10            ifeq ($(OPENJDK_TARGET_OS), windows)
    1.11 @@ -504,6 +505,7 @@
    1.12  		$(CD) $$($1_OBJECT_DIR) \
    1.13  		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
    1.14            endif
    1.15 +endif # not possible when stripping is disabled
    1.16  endif # no MacOS X support yet
    1.17          else
    1.18            ifeq ($(OPENJDK_TARGET_OS), windows)
    1.19 @@ -584,6 +586,7 @@
    1.20  
    1.21          ifeq ($(ZIP_DEBUGINFO_FILES), true)
    1.22  ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
    1.23 +ifneq ($$($1_STRIP_POLICY), no_strip)
    1.24            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
    1.25  
    1.26            ifeq ($(OPENJDK_TARGET_OS), windows)
    1.27 @@ -596,6 +599,7 @@
    1.28  		$(CD) $$($1_OBJECT_DIR) \
    1.29  		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
    1.30            endif
    1.31 +endif
    1.32  endif # no MacOS X support yet
    1.33          else
    1.34            ifeq ($(OPENJDK_TARGET_OS), windows)

mercurial