diff make/jprt.gmk @ 1015:23862fc517bb

6722084: JPRT make file doesn't create required symbolic link to libjvm.so Summary: Use -y zip option to preserve symbolic links. Reviewed-by: never, jcoomes, kamg
author kvn
date Wed, 14 Oct 2009 11:42:59 -0700
parents a61af66fc99e
children c18cbe5936b8
line wrap: on
line diff
--- a/make/jprt.gmk	Wed Oct 14 10:36:57 2009 -0700
+++ b/make/jprt.gmk	Wed Oct 14 11:42:59 2009 -0700
@@ -29,17 +29,24 @@
   MILESTONE=$(JPRT_BUILD_VERSION)
 endif
 
+ifeq ($(OSNAME),windows)
+  ZIPFLAGS=-q
+else
+  # store symbolic links as the link
+  ZIPFLAGS=-q -y
+endif
+
 jprt_build_product: all_product copy_product_jdk export_product_jdk
 	( $(CD) $(JDK_IMAGE_DIR) && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 jprt_build_fastdebug: all_fastdebug copy_fastdebug_jdk export_fastdebug_jdk
 	( $(CD) $(JDK_IMAGE_DIR)/fastdebug && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 jprt_build_debug: all_debug copy_debug_jdk export_debug_jdk
 	( $(CD) $(JDK_IMAGE_DIR)/debug && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 .PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug