Mercurial > hg > openjdk > bsd-port

changeset 301:9ab499be1759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 11 Dec 2010 09:07:01 -0800
parents fac0329115ab (current diff) f1591eed71f6 (diff)
children dc732a8e978e
files
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Dec 04 08:27:27 2010 -0800
+++ b/.hgtags	Sat Dec 11 09:07:01 2010 -0800
@@ -95,3 +95,4 @@
 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
 366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
+2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
--- a/make/deploy-rules.gmk	Sat Dec 04 08:27:27 2010 -0800
+++ b/make/deploy-rules.gmk	Sat Dec 11 09:07:01 2010 -0800
@@ -46,7 +46,6 @@
 # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
 ifeq ($(ARCH_DATA_MODEL), 32)
   ifeq ($(PLATFORM), windows)
-    ifneq ($(KERNEL), off)
       EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
         $(ECHO) true ; \
       else \
@@ -55,7 +54,6 @@
   ifeq ($(EC_TMP), true)
         DEPLOY_BUILD_TARGETS += extra-comp-all
       endif
-    endif
   endif
 endif