changeset 171:68b85ce111f2

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
author ohair
date Mon, 14 Apr 2008 14:52:27 -0700
parents 63e1f1ed9805
children eac50a34a8e0 b1bbd90b0c4f
files make/common/shared/Defs-control.gmk
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-control.gmk	Mon Apr 07 17:38:21 2008 -0700
+++ b/make/common/shared/Defs-control.gmk	Mon Apr 14 14:52:27 2008 -0700
@@ -69,9 +69,8 @@
 # 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