Mercurial > hg > openjdk > jdk7

changeset 308:5d86d951426a jdk7-b131

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author cl
date Wed, 23 Feb 2011 15:48:23 -0800
parents 5466f13d19be (diff) da55264ff2fb (current diff)
children 0f62a65fb666
files
diffstat 2 files changed, 12 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Feb 16 13:29:01 2011 -0800
+++ b/.hgtags	Wed Feb 23 15:48:23 2011 -0800
@@ -104,3 +104,4 @@
 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
 a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
--- a/make/deploy-rules.gmk	Wed Feb 16 13:29:01 2011 -0800
+++ b/make/deploy-rules.gmk	Wed Feb 23 15:48:23 2011 -0800
@@ -64,19 +64,17 @@
     endif
   endif
 endif
-  
-ifneq ($(KERNEL), off)
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    ifeq ($(PLATFORM), windows)
-      # Only set up to use UPX compression if it is available
-      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
-        $(ECHO) true ; \
-      else \
-        $(ECHO) false ; \
-      fi )
-      ifeq ($(UP_TMP), true)
-        DEPLOY_BUILD_TARGETS += cmd-comp-all
-      endif
+
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ifeq ($(PLATFORM), windows)
+    # Only set up to use UPX compression if it is available
+    UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
+      $(ECHO) true ; \
+    else \
+      $(ECHO) false ; \
+    fi )
+    ifeq ($(UP_TMP), true)
+      DEPLOY_BUILD_TARGETS += cmd-comp-all
     endif
   endif
 endif