OpenJDK / amber / amber
changeset 7225:0961b69bacc0
Merge
| author | igor |
|---|---|
| date | Tue, 07 Dec 2010 16:41:14 -0800 |
| parents | 67e255a02b63 3555a5488ef3 |
| children | 76ffa3eac0d7 |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Tue Nov 30 09:23:44 2010 -0800 +++ b/.hgtags-top-repo Tue Dec 07 16:41:14 2010 -0800 @@ -94,3 +94,4 @@ 7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119 +366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
--- a/make/deploy-rules.gmk Tue Nov 30 09:23:44 2010 -0800 +++ b/make/deploy-rules.gmk Tue Dec 07 16:41:14 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