diff options
| author | andrew <unknown> | 2019-03-15 17:19:15 +0000 |
|---|---|---|
| committer | bell-sw <liberica@bell-sw.com> | 2019-04-20 16:51:49 +0300 |
| commit | 77a8f773e93b5895082e9e356e7e2c44d960d62f (patch) | |
| tree | 48828483dce16651084023d0deb5e2cdca6a38c5 | |
| parent | 32bd6e63232d88a007aa4670f6bb9668bd672922 (diff) | |
| download | jdk8u-77a8f773e93b5895082e9e356e7e2c44d960d62f.tar.gz | |
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
| -rw-r--r-- | make/common/NativeCompilation.gmk | 4 |
1 files changed, 4 insertions, 0 deletions
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) |