diff options
| author | paulk <none@none> | 2011-02-14 14:29:10 -0500 |
|---|---|---|
| committer | paulk <none@none> | 2011-02-14 14:29:10 -0500 |
| commit | a79b70d8fce41b7090da00a2bc6df492d04fa326 (patch) | |
| tree | d83d8d224fb43334b9abaf728c45dfff6220d8f3 /make | |
| parent | 5afb4b035fc4264efae690009b0389dd34e08d9c (diff) | |
7019371: JDK7 is not building UPX. IFTW wrappers are not compressed.
Reviewed-by: billyh, jqzuo
Diffstat (limited to 'make')
| -rw-r--r-- | make/deploy-rules.gmk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 1308d51..d05d409 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -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 |