提交 21335e18 编写于 作者: A andrew

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
上级 8c94a0ad
...@@ -492,6 +492,7 @@ define SetupNativeCompilation ...@@ -492,6 +492,7 @@ define SetupNativeCompilation
ifeq ($(ZIP_DEBUGINFO_FILES), true) ifeq ($(ZIP_DEBUGINFO_FILES), true)
ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet 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 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
...@@ -504,6 +505,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet ...@@ -504,6 +505,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
$(CD) $$($1_OBJECT_DIR) \ $(CD) $$($1_OBJECT_DIR) \
&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
endif endif
endif # not possible when stripping is disabled
endif # no MacOS X support yet endif # no MacOS X support yet
else else
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
...@@ -584,6 +586,7 @@ endif # no MacOS X support yet ...@@ -584,6 +586,7 @@ endif # no MacOS X support yet
ifeq ($(ZIP_DEBUGINFO_FILES), true) ifeq ($(ZIP_DEBUGINFO_FILES), true)
ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
ifneq ($$($1_STRIP_POLICY), no_strip)
$1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
...@@ -596,6 +599,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet ...@@ -596,6 +599,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
$(CD) $$($1_OBJECT_DIR) \ $(CD) $$($1_OBJECT_DIR) \
&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
endif endif
endif
endif # no MacOS X support yet endif # no MacOS X support yet
else else
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册