changeset 5557:9cb5dfd703dd

PR1948: Only try and symlink debuginfo if STRIP_POLICY is other than no_strip
author andrew
date Tue, 26 Aug 2014 17:14:48 +0100
parents b517477362d1
children c8c45895c863
files make/linux/makefiles/vm.make
diffstat 1 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/makefiles/vm.make	Wed Aug 13 15:49:58 2014 +0100
+++ b/make/linux/makefiles/vm.make	Tue Aug 26 17:14:48 2014 +0100
@@ -354,28 +354,28 @@
             fi 								\
 	}
 
- 	ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-    	     ifneq ($(STRIP_POLICY),no_strip)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+     ifneq ($(STRIP_POLICY),no_strip)
 	     	   $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
 		   $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
-  	     endif
-    	     ifeq ($(STRIP_POLICY),all_strip)
+     endif
+     ifeq ($(STRIP_POLICY),all_strip)
 	     	  $(QUIETLY) $(STRIP) $@
-    	     else
-    	     ifeq ($(STRIP_POLICY),min_strip)
+     else
+	ifeq ($(STRIP_POLICY),min_strip)
 	     	  $(QUIETLY) $(STRIP) -g $@
-    		  # implied else here is no stripping at all
-    	     endif
-    	     endif
- 	endif
-	$(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
- 	ifeq ($(ZIP_DEBUGINFO_FILES),1)
-   	     ifneq ($(STRIP_POLICY),no_strip)
-	     	   $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+	  # implied else here is no stripping at all
+	endif
+     endif
+     ifneq ($(STRIP_POLICY),no_strip)
+	       $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+	ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	           $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
 		   $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
 		   [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
-   	     endif
- 	endif
+	endif
+     endif
+endif
 
 DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
 DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)