Merge

make/deploy-rules.gmk

@@ -65,8 +65,7 @@ ifneq ($(JQS), off)
   endif
 endif
 
-ifneq ($(KERNEL), off)
-  ifeq ($(ARCH_DATA_MODEL), 32)
+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 \
@@ -78,7 +77,6 @@ ifneq ($(KERNEL), off)
       DEPLOY_BUILD_TARGETS += cmd-comp-all
     endif
   endif
-  endif
 endif