OpenJDK / type-annotations / type-annotations
changeset 1022:4f4c924640b8
Merge
| author | kvn |
|---|---|
| date | Thu, 12 Dec 2013 11:04:54 -0800 |
| parents | 46696858adab 1e1f86d5d4e2 |
| children | 06dd913373b4 |
| files | common/autoconf/spec.gmk.in |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Dec 05 15:12:22 2013 -0800 +++ b/.hgtags Thu Dec 12 11:04:54 2013 -0800 @@ -241,3 +241,4 @@ a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117 0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118 9e90215673be68a3e77a9e444e4232076373734d jdk8-b119 +cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120
--- a/Makefile Thu Dec 05 15:12:22 2013 -0800 +++ b/Makefile Thu Dec 12 11:04:54 2013 -0800 @@ -66,12 +66,12 @@ # 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)
--- a/common/autoconf/spec.gmk.in Thu Dec 05 15:12:22 2013 -0800 +++ b/common/autoconf/spec.gmk.in Thu Dec 12 11:04:54 2013 -0800 @@ -237,7 +237,6 @@ 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
--- a/make/MakeHelpers.gmk Thu Dec 05 15:12:22 2013 -0800 +++ b/make/MakeHelpers.gmk Thu Dec 12 11:04:54 2013 -0800 @@ -50,7 +50,7 @@ # 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