Mercurial > hg > release > icedtea7-forest-2.1
changeset 100:3e781aa606d4
6857805: Fix openjdk builds to avoid building deploy repository
Reviewed-by: xdono
author | ohair |
---|---|
date | Mon, 06 Jul 2009 22:37:00 -0700 |
parents | 46c0f8989eb2 |
children | 269c1ec4435d |
files | make/Defs-internal.gmk make/deploy-rules.gmk |
diffstat | 2 files changed, 14 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/make/deploy-rules.gmk Mon Jul 06 17:12:40 2009 -0400 +++ b/make/deploy-rules.gmk Mon Jul 06 22:37:00 2009 -0700 @@ -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)