Mercurial > hg > openjdk > jdk7u
changeset 101:269c1ec4435d jdk7-b64
Merge
author | jqzuo |
---|---|
date | Tue, 07 Jul 2009 10:20:17 -0400 |
parents | 633840bd4c5b (current diff) 3e781aa606d4 (diff) |
children | d92b13b3c138 |
files | |
diffstat | 2 files changed, 14 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Defs-internal.gmk Tue Jul 07 10:14:46 2009 -0400 +++ b/make/Defs-internal.gmk Tue Jul 07 10:20:17 2009 -0400 @@ -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.
--- a/make/deploy-rules.gmk Tue Jul 07 10:14:46 2009 -0400 +++ b/make/deploy-rules.gmk Tue Jul 07 10:20:17 2009 -0400 @@ -31,23 +31,6 @@ 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)