7019371: JDK7 is not building UPX. IFTW wrappers are not compressed

Reviewed-by: billyh, jqzuo
This commit is contained in:
Paul Klingaman 2011-02-14 14:29:10 -05:00
parent f837176802
commit 52dac61212

View File

@ -64,19 +64,17 @@ ifneq ($(JQS), off)
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