Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6672777: Broken deploy build from jdk fix 6668781 for cygwin windows
authorohair
Sun, 09 Mar 2008 14:16:49 -0700
changeset 32 d190436d5b3e
parent 31 a8fdfca90643
child 33 51a7bc3e93a0
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
jdk/make/common/Defs.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/Defs.gmk	Thu Mar 06 11:37:14 2008 -0800
+++ b/jdk/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
jdk-sandbox