Mercurial > hg > release > icedtea7-forest-2.0
changeset 341:e2370dfcc721
7019371: JDK7 is not building UPX. IFTW wrappers are not compressed.
Reviewed-by: billyh, jqzuo
author | paulk |
---|---|
date | Mon, 14 Feb 2011 14:29:10 -0500 |
parents | df3abd560cbd |
children | 5466f13d19be |
files | make/deploy-rules.gmk |
diffstat | 1 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/make/deploy-rules.gmk Wed Feb 09 16:05:25 2011 -0500 +++ b/make/deploy-rules.gmk Mon Feb 14 14:29:10 2011 -0500 @@ -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