7036525: Disable alternative source mechanism for OPENJDK builds

Thu, 05 May 2011 21:20:21 -0400

author
dholmes
date
Thu, 05 May 2011 21:20:21 -0400
changeset 2863
ededdaaf8ca5
parent 2862
1d80a2429f59
child 2864
f4063a3503fc
child 2886
357d1f583599

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 file | annotate | diff | comparison | revisions
     1.1 --- a/make/altsrc.make	Thu May 05 12:50:42 2011 -0400
     1.2 +++ b/make/altsrc.make	Thu May 05 21:20:21 2011 -0400
     1.3 @@ -24,7 +24,8 @@
     1.4  
     1.5  # This file defines variables and macros which are used in the makefiles to 
     1.6  # allow distributions to augment or replace common hotspot code with 
     1.7 -# distribution-specific source files.
     1.8 +# distribution-specific source files. This capability is disabled when
     1.9 +# an OPENJDK build is requested, unless HS_ALT_SRC_REL has been set externally.
    1.10  
    1.11  # Requires: GAMMADIR
    1.12  # Provides:
    1.13 @@ -33,14 +34,17 @@
    1.14  
    1.15  HS_COMMON_SRC_REL=src
    1.16  
    1.17 -# This needs to be changed to a more generic location, but we keep it as this 
    1.18 -# for now for compatibility
    1.19 -HS_ALT_SRC_REL=src/closed
    1.20 +ifneq ($(OPENJDK),true)
    1.21 +  # This needs to be changed to a more generic location, but we keep it 
    1.22 +  # as this for now for compatibility
    1.23 +  HS_ALT_SRC_REL=src/closed
    1.24 +else
    1.25 +  HS_ALT_SRC_REL=NO_SUCH_PATH
    1.26 +endif
    1.27  
    1.28  HS_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL)
    1.29  HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL)
    1.30  
    1.31 -
    1.32  ## altsrc-equiv 
    1.33  # 
    1.34  # Convert a common source path to an alternative source path

mercurial