diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | common/autoconf/spec.gmk.in | 1 | ||||
| -rw-r--r-- | make/MakeHelpers.gmk | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -241,3 +241,4 @@ cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116 a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117 0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118 9e90215673be68a3e77a9e444e4232076373734d jdk8-b119 +cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120 @@ -66,12 +66,12 @@ else # First, find out the valid targets # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. - all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ - $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \ + all_phony_targets=$(filter-out $(global_targets) bundles bundles-only final-images-only, $(strip $(shell \ + cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \ grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) $(all_phony_targets): - @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ + @$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \ $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true .PHONY: $(all_phony_targets) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 08412bc..e8649dd 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -236,7 +236,6 @@ HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images -JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist CORBA_DIST=$(CORBA_OUTPUTDIR)/dist diff --git a/make/MakeHelpers.gmk b/make/MakeHelpers.gmk index 63223ee..66f4ca4 100644 --- a/make/MakeHelpers.gmk +++ b/make/MakeHelpers.gmk @@ -50,7 +50,7 @@ BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes # Global targets are possible to run either with or without a SPEC. The prototypical # global target is "help". -global_targets=help jprt% bridgeBuild +global_targets=help jprt% bridgeBuild bridge2configure ############################## # Functions |