From 21335e18ad6a9b3f8f93c4dd2a370091b0e17dc0 Mon Sep 17 00:00:00 2001
From: andrew <unknown>
Date: Fri, 15 Mar 2019 17:19:15 +0000
Subject: [PATCH] 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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 89f63d4..d961cf3 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -492,6 +492,7 @@ define SetupNativeCompilation
 
         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 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
 		$(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 @@ endif # no MacOS X support yet
 
         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 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
 		$(CD) $$($1_OBJECT_DIR) \
 		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
           endif
+endif
 endif # no MacOS X support yet
         else
           ifeq ($(OPENJDK_TARGET_OS), windows)
-- 
GitLab