diff options
| author | jqzuo <none@none> | 2009-07-07 10:20:17 -0400 |
|---|---|---|
| committer | jqzuo <none@none> | 2009-07-07 10:20:17 -0400 |
| commit | 108acec63eed96c11477376fa0811e46c7e17ab9 (patch) | |
| tree | 0e08cd2c1bb072f2a155ae68cfd85019a7f60616 | |
| parent | e391481f5b0baff95ea5fd321f6419fbba4861e5 (diff) | |
| parent | cc0934c0663f1afe1e3f067a12d4c3cd6c49e5f2 (diff) | |
Mergejdk7-b64
| -rw-r--r-- | make/Defs-internal.gmk | 14 | ||||
| -rw-r--r-- | make/deploy-rules.gmk | 17 |
2 files changed, 14 insertions, 17 deletions
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index fc18e7f..c35907c 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 1054d42..2884601 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) |