Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/make/Defs-internal.gmk	Mon Jul 06 17:12:40 2009 -0400
     1.2 +++ b/make/Defs-internal.gmk	Mon Jul 06 22:37:00 2009 -0700
     1.3 @@ -153,6 +153,20 @@
     1.4    endif
     1.5    SKIP_OPENJDK_BUILD = true
     1.6  else
     1.7 +  
     1.8 +  # Various non-OPENJDK reasons to NOT build the deploy repository
     1.9 +  ifeq ($(ARCH), ia64)
    1.10 +    BUILD_DEPLOY=false
    1.11 +  endif
    1.12 +  ifeq ($(ARCH), sparcv9)
    1.13 +    BUILD_DEPLOY=false
    1.14 +  endif
    1.15 +  ifeq ($(ARCH), amd64)
    1.16 +    ifeq ($(PLATFORM), solaris)
    1.17 +      BUILD_DEPLOY=false
    1.18 +    endif
    1.19 +  endif
    1.20 +
    1.21    ifndef SKIP_OPENJDK_BUILD
    1.22      #SKIP_OPENJDK_BUILD = false
    1.23      # Until 6675289 is resolved, or this feature is removed.

     2.1 --- a/make/deploy-rules.gmk	Mon Jul 06 17:12:40 2009 -0400
     2.2 +++ b/make/deploy-rules.gmk	Mon Jul 06 22:37:00 2009 -0700
     2.3 @@ -31,23 +31,6 @@
     2.4  
     2.5  DEPLOY = deploy
     2.6  
     2.7 -BUILD_DEPLOY=true
     2.8 -
     2.9 -ifeq ($(ARCH), ia64) 
    2.10 -  BUILD_DEPLOY=false
    2.11 -endif
    2.12 -
    2.13 -ifeq ($(ARCH), sparcv9)
    2.14 -  BUILD_DEPLOY=false;
    2.15 -endif
    2.16 -
    2.17 -ifeq ($(ARCH), amd64)
    2.18 -  ifeq ($(PLATFORM), solaris)
    2.19 -    BUILD_DEPLOY=false
    2.20 -  endif
    2.21 -endif
    2.22 -
    2.23 -
    2.24  # put the generated bundles in their own place in OUTPUTDIR
    2.25  DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR)
    2.26