# HG changeset patch
# User dholmes
# Date 1304644821 14400
# Node ID 004656c453807b78d29ee98f6fe1ffd92dcdfa18
# Parent  e3bea7d56a98959dc81e2cf273c345437a88b72a
7036525: Disable alternative source mechanism for OPENJDK builds
Summary: By default if OPENJDK=true is set then we don't look in the alt-src predefined location. The user can explicitly set HS_ALT_SRC_REL to the desired location in conjunction with OPENJDK=true, if they wish.
Reviewed-by: jcoomes, kamg

diff -r e3bea7d56a98 -r 004656c45380 hotspot/make/altsrc.make
--- a/hotspot/make/altsrc.make	Thu May 05 12:50:42 2011 -0400
+++ b/hotspot/make/altsrc.make	Thu May 05 21:20:21 2011 -0400
@@ -24,7 +24,8 @@
 
 # This file defines variables and macros which are used in the makefiles to 
 # allow distributions to augment or replace common hotspot code with 
-# distribution-specific source files.
+# distribution-specific source files. This capability is disabled when
+# an OPENJDK build is requested, unless HS_ALT_SRC_REL has been set externally.
 
 # Requires: GAMMADIR
 # Provides:
@@ -33,14 +34,17 @@
 
 HS_COMMON_SRC_REL=src
 
-# This needs to be changed to a more generic location, but we keep it as this 
-# for now for compatibility
-HS_ALT_SRC_REL=src/closed
+ifneq ($(OPENJDK),true)
+  # This needs to be changed to a more generic location, but we keep it 
+  # as this for now for compatibility
+  HS_ALT_SRC_REL=src/closed
+else
+  HS_ALT_SRC_REL=NO_SUCH_PATH
+endif
 
 HS_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL)
 HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL)
 
-
 ## altsrc-equiv 
 # 
 # Convert a common source path to an alternative source path