Mercurial > hg > truffle

comparison make/altsrc.make @ 3331:ededdaaf8ca5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author dholmes
date Thu, 05 May 2011 21:20:21 -0400
parents d8a72fbc4be7
children
comparison
equal deleted inserted replaced
3330:1d80a2429f59 3331:ededdaaf8ca5
22 # 22 #
23 # 23 #
24 24
25 # This file defines variables and macros which are used in the makefiles to 25 # This file defines variables and macros which are used in the makefiles to
26 # allow distributions to augment or replace common hotspot code with 26 # allow distributions to augment or replace common hotspot code with
27 # distribution-specific source files. 27 # distribution-specific source files. This capability is disabled when
28 # an OPENJDK build is requested, unless HS_ALT_SRC_REL has been set externally.
28 29
29 # Requires: GAMMADIR 30 # Requires: GAMMADIR
30 # Provides: 31 # Provides:
31 # variables: HS_COMMON_SRC, HS_ALT_SRC, HS_COMMON_SRC_REL, and HS_ALT_SRC_REL 32 # variables: HS_COMMON_SRC, HS_ALT_SRC, HS_COMMON_SRC_REL, and HS_ALT_SRC_REL
32 # functions: altsrc-equiv, if-has-altsrc, altsrc, altsrc-replace 33 # functions: altsrc-equiv, if-has-altsrc, altsrc, altsrc-replace
33 34
34 HS_COMMON_SRC_REL=src 35 HS_COMMON_SRC_REL=src
35 36
36 # This needs to be changed to a more generic location, but we keep it as this 37 ifneq ($(OPENJDK),true)
37 # for now for compatibility 38 # This needs to be changed to a more generic location, but we keep it
38 HS_ALT_SRC_REL=src/closed 39 # as this for now for compatibility
40 HS_ALT_SRC_REL=src/closed
41 else
42 HS_ALT_SRC_REL=NO_SUCH_PATH
43 endif
39 44
40 HS_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL) 45 HS_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL)
41 HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL) 46 HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL)
42
43 47
44 ## altsrc-equiv 48 ## altsrc-equiv
45 # 49 #
46 # Convert a common source path to an alternative source path 50 # Convert a common source path to an alternative source path
47 # 51 #