Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 9:48d06b4c6460
6672777: Broken deploy build from jdk fix 6668781 for cygwin windows
Summary: deploy workspace does not set BUILDDIR, uses it, assumes it is jdk/make.
Reviewed-by: xdono
author | ohair |
---|---|
date | Sun, 09 Mar 2008 14:16:49 -0700 |
parents | 65c8fd93d01c |
children | 8ef9fd5c28fd |
files | make/common/Defs.gmk |
diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs.gmk Thu Mar 06 11:37:14 2008 -0800 +++ b/make/common/Defs.gmk Sun Mar 09 14:16:49 2008 -0700 @@ -41,7 +41,15 @@ SUN_MAKE_TEST:sh = echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33 ifndef JDK_TOPDIR - JDK_TOPDIR=$(BUILDDIR)/.. + ifdef BUILDDIR + JDK_TOPDIR=$(BUILDDIR)/.. + else + JDK_TOPDIR:=$(error "ERROR: Cannot define top of jdk repository") + endif +endif +ifndef BUILDDIR + # Hack, due to deploy repository using this file. + BUILDDIR=$(JDK_TOPDIR)/make endif ifndef JDK_MAKE_SHARED_DIR JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared