diff options
| author | igor <none@none> | 2010-12-07 16:41:14 -0800 |
|---|---|---|
| committer | igor <none@none> | 2010-12-07 16:41:14 -0800 |
| commit | cc8b45c81485a37c19ae06cbda0dbcb1b6f5716a (patch) | |
| tree | f1f2d969fbe4cec35687618f41b5be3be3680dad | |
| parent | c31770ab82b30051b1ab73467b8183bc80110cb1 (diff) | |
| parent | 4843e536f44078b6dcde08e9a84cd3d228eba06f (diff) | |
Mergejdk7-b121
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | make/deploy-rules.gmk | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -94,3 +94,4 @@ e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115 7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119 +366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120 diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 7e080a6..6b9f50c 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -46,7 +46,6 @@ DEPLOY_BUILD_TARGETS = sanity deploy # 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 ($(ARCH_DATA_MODEL), 32) ifeq ($(EC_TMP), true) DEPLOY_BUILD_TARGETS += extra-comp-all endif - endif endif endif |