From 41f3a0a4dcc0345fb13d161e8ca6adab1d1c76d7 Mon Sep 17 00:00:00 2001
From: dholmes <unknown>
Date: Thu, 5 May 2011 21:20:21 -0400
Subject: [PATCH] 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

---
 make/altsrc.make | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/make/altsrc.make b/make/altsrc.make
index a86b83268..027dc35d9 100644
--- a/make/altsrc.make
+++ b/make/altsrc.make
@@ -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
-- 
GitLab