提交 41f3a0a4 编写于 作者: D dholmes

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
上级 c5871620
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
# This file defines variables and macros which are used in the makefiles to # This file defines variables and macros which are used in the makefiles to
# allow distributions to augment or replace common hotspot code with # 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 # Requires: GAMMADIR
# Provides: # Provides:
...@@ -33,14 +34,17 @@ ...@@ -33,14 +34,17 @@
HS_COMMON_SRC_REL=src HS_COMMON_SRC_REL=src
# This needs to be changed to a more generic location, but we keep it as this ifneq ($(OPENJDK),true)
# for now for compatibility # This needs to be changed to a more generic location, but we keep it
HS_ALT_SRC_REL=src/closed # 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_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL)
HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL) HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL)
## altsrc-equiv ## altsrc-equiv
# #
# Convert a common source path to an alternative source path # Convert a common source path to an alternative source path
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册