changeset 14193:52db4375e77d

8253550: [8u] JDK-8252395 breaks the build for make STRIP_POLICY=no_strip Summary: Add check that STRIP_POLICY is not no_strip before attempting to reference stripped debuginfo Reviewed-by: aph, sgehwolf
author andrew
date Sat, 26 Sep 2020 19:40:44 +0100
parents 49e7d9293ee5
children e148a6a0b505
files make/CompileLaunchers.gmk
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileLaunchers.gmk	Fri Sep 30 22:10:44 2016 +0300
+++ b/make/CompileLaunchers.gmk	Sat Sep 26 19:40:44 2020 +0100
@@ -249,7 +249,9 @@
 BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   ifneq ($(POST_STRIP_CMD), )
-    BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(DEBUGINFO_EXT)
+    ifneq ($(STRIP_POLICY), no_strip)
+      BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(DEBUGINFO_EXT)
+    endif
   endif
 endif
 
@@ -559,7 +561,9 @@
 BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX)
 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   ifneq ($(POST_STRIP_CMD), )
-    BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(DEBUGINFO_EXT)
+    ifneq ($(STRIP_POLICY), no_strip)
+      BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(DEBUGINFO_EXT)
+    endif
   endif
 endif