diff --git a/.hgtags b/.hgtags index 35f1f600c87d40e1462605bc43dd783382e7fc40..77da515c6e416158eb6981185f7e1742b5e30b34 100644 --- a/.hgtags +++ b/.hgtags @@ -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 7e080a60e40c28dae7ac3edb86229fa5a17b2158..6b9f50c97670d0978799f3c8dec235a7e978b161 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