diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index fc18e7fd40..c35907c5ee 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -153,6 +153,20 @@ ifdef OPENJDK
   endif
   SKIP_OPENJDK_BUILD = true
 else
+  
+  # Various non-OPENJDK reasons to NOT build the deploy repository
+  ifeq ($(ARCH), ia64)
+    BUILD_DEPLOY=false
+  endif
+  ifeq ($(ARCH), sparcv9)
+    BUILD_DEPLOY=false
+  endif
+  ifeq ($(ARCH), amd64)
+    ifeq ($(PLATFORM), solaris)
+      BUILD_DEPLOY=false
+    endif
+  endif
+
   ifndef SKIP_OPENJDK_BUILD
     #SKIP_OPENJDK_BUILD = false
     # Until 6675289 is resolved, or this feature is removed.
diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk
index 1054d421e0..2884601bb3 100644
--- a/make/deploy-rules.gmk
+++ b/make/deploy-rules.gmk
@@ -31,23 +31,6 @@ deploy:  deploy-build
 
 DEPLOY = deploy
 
-BUILD_DEPLOY=true
-
-ifeq ($(ARCH), ia64) 
-  BUILD_DEPLOY=false
-endif
-
-ifeq ($(ARCH), sparcv9)
-  BUILD_DEPLOY=false;
-endif
-
-ifeq ($(ARCH), amd64)
-  ifeq ($(PLATFORM), solaris)
-    BUILD_DEPLOY=false
-  endif
-endif
-
-
 # put the generated bundles in their own place in OUTPUTDIR
 DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR)