diff -r d5c363be4605 -r 48f8548b018b make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Mon Jul 06 17:12:40 2009 -0400
+++ b/make/Defs-internal.gmk	Mon Jul 06 22:37:00 2009 -0700
@@ -153,6 +153,20 @@
   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.