From 0e82e0faab1def2b530d67bb63fb8db415ca6fbe Mon Sep 17 00:00:00 2001
From: ohair <unknown>
Date: Mon, 14 Apr 2008 14:52:27 -0700
Subject: [PATCH] 6484686: The next directory looks like it is no longer part
 of the build (deploy makefiles) Summary: Getting rid of the _OUTPUTDIR
 settings. Using BUILD_PARENT_DIRECTORY instead. This solves problems with the
 "/build/windows-i586*" paths getting mangled on Windows builds (fastdebug
 builds in particular). Reviewed-by: tbell

---
 make/common/shared/Defs-control.gmk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/make/common/shared/Defs-control.gmk b/make/common/shared/Defs-control.gmk
index 172166aed..ee3196161 100644
--- a/make/common/shared/Defs-control.gmk
+++ b/make/common/shared/Defs-control.gmk
@@ -69,9 +69,8 @@ endif
 # Get shared platform settings
 include $(JDK_MAKE_SHARED_DIR)/Platform.gmk
 
-# Default output directory
+# Default directory immediately above the "build" output directory (OUTPUTDIR)
 BUILD_PARENT_DIRECTORY=$(TOPDIR)
-_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
 
 # Get platform specific settings
 include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
-- 
GitLab