Fri, 18 Jan 2013 16:48:25 +0100
8003693: build-infra: bridgeBuild should allow for partial build (no hotspot)
Reviewed-by: tbell
common/makefiles/Jprt.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/common/makefiles/Jprt.gmk Fri Jan 18 09:58:23 2013 +0100 1.2 +++ b/common/makefiles/Jprt.gmk Fri Jan 18 16:48:25 2013 +0100 1.3 @@ -43,24 +43,20 @@ 1.4 1.5 BUILD_DIR_ROOT:=$(root_dir)/build 1.6 1.7 -# Appears to be an open build 1.8 -OPEN_BUILD := \ 1.9 -$(shell \ 1.10 - if [ -d $(root_dir)/jdk/src/closed \ 1.11 - -o -d $(root_dir)/jdk/make/closed \ 1.12 - -o -d $(root_dir)/jdk/test/closed \ 1.13 - -o -d $(root_dir)/hotspot/src/closed \ 1.14 - -o -d $(root_dir)/hotspot/make/closed \ 1.15 - -o -d $(root_dir)/hotspot/test/closed ] ; then \ 1.16 - echo "false"; \ 1.17 - else \ 1.18 - echo "true"; \ 1.19 - fi \ 1.20 - ) 1.21 ifdef OPENJDK 1.22 OPEN_BUILD=true 1.23 +else 1.24 + OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \ 1.25 + $(wildcard $(root_dir)/jdk/make/closed), \ 1.26 + $(wildcard $(root_dir)/jdk/test/closed), \ 1.27 + $(wildcard $(root_dir)/hotspot/src/closed), \ 1.28 + $(wildcard $(root_dir)/hotspot/make/closed), \ 1.29 + $(wildcard $(root_dir)/hotspot/test/closed)), \ 1.30 + false,true) 1.31 endif 1.32 1.33 +HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false) 1.34 + 1.35 ########################################################################### 1.36 # To help in adoption of the new configure&&make build process, a bridge 1.37 # build will use the old settings to run configure and do the build. 1.38 @@ -103,6 +99,11 @@ 1.39 ifdef ALT_FREETYPE_HEADERS_PATH 1.40 @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp 1.41 endif 1.42 +ifeq ($(HOTSPOT_AVAILABLE),false) 1.43 + ifdef ALT_JDK_IMPORT_PATH 1.44 + @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp 1.45 + endif 1.46 +endif 1.47 ifeq ($(OPEN_BUILD),true) 1.48 @$(ECHO) " --enable-openjdk-only " >> $@.tmp 1.49 else