# HG changeset patch # User paulk # Date 1297711750 18000 # Node ID e2370dfcc7219dae0acf97f0f1a96ef96ce631e0 # Parent df3abd560cbde94de8253337618135f15ef7ef99 7019371: JDK7 is not building UPX. IFTW wrappers are not compressed. Reviewed-by: billyh, jqzuo diff -r df3abd560cbd -r e2370dfcc721 make/deploy-rules.gmk --- 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