OpenJDK / jdk / hs
changeset 36729:8a474f471571
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 21:30:42 +0200 |
| parents | 9bc1d0332a48 a86a1a1cae13 |
| children | 26c91275d734 |
| files | |
| diffstat | 4 files changed, 12 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Thu Mar 31 01:13:19 2016 -0700 +++ b/.hgtags-top-repo Wed Jul 05 21:30:42 2017 +0200 @@ -354,3 +354,4 @@ 1787bdaabb2b6f4193406e25a50cb0419ea8e8f3 jdk-9+109 925be13b3740d07a5958ccb5ab3c0ae1baba7055 jdk-9+110 f900d5afd9c83a0df8f36161c27c5e4c86a66f4c jdk-9+111 +03543a758cd5890f2266e4b9678378a925dde22a jdk-9+112
--- a/common/conf/jib-profiles.js Thu Mar 31 01:13:19 2016 -0700 +++ b/common/conf/jib-profiles.js Wed Jul 05 21:30:42 2017 +0200 @@ -241,8 +241,7 @@ target_os: "linux", target_cpu: "x64", dependencies: concat(common.dependencies, "devkit"), - configure_args: common.configure_args, - configure_args: concat(common.configure_args, "--with-zlib=system"), + configure_args: concat(common.configure_args, "--with-zlib=system"), make_args: common.make_args }, @@ -251,8 +250,8 @@ target_cpu: "x86", build_cpu: "x64", dependencies: concat(common.dependencies, "devkit"), - configure_args: concat(common.configure_args, common.configure_args_32bit), - configure_args: concat(common.configure_args, "--with-zlib=system"), + configure_args: concat(common.configure_args, common.configure_args_32bit, + "--with-zlib=system"), make_args: common.make_args }, @@ -260,8 +259,7 @@ target_os: "macosx", target_cpu: "x64", dependencies: concat(common.dependencies, "devkit"), - configure_args: common.configure_args, - configure_args: concat(common.configure_args, "--with-zlib=system"), + configure_args: concat(common.configure_args, "--with-zlib=system"), make_args: common.make_args }, @@ -269,8 +267,7 @@ target_os: "solaris", target_cpu: "x64", dependencies: concat(common.dependencies, "devkit", "cups"), - configure_args: common.configure_args, - configure_args: concat(common.configure_args, "--with-zlib=system"), + configure_args: concat(common.configure_args, "--with-zlib=system"), make_args: common.make_args }, @@ -278,8 +275,7 @@ target_os: "solaris", target_cpu: "sparcv9", dependencies: concat(common.dependencies, "devkit", "cups"), - configure_args: common.configure_args, - configure_args: concat(common.configure_args, "--with-zlib=system"), + configure_args: concat(common.configure_args, "--with-zlib=system"), make_args: common.make_args },
--- a/make/common/Modules.gmk Thu Mar 31 01:13:19 2016 -0700 +++ b/make/common/Modules.gmk Wed Jul 05 21:30:42 2017 +0200 @@ -252,8 +252,9 @@ # * PLATFORM_MODULES # * JRE_TOOL_MODULES define ReadImportMetaData - IMPORTED_MODULES := $(call FindImportedModules) - $(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadImportMetaData, $m))) + IMPORTED_MODULES := $$(call FindImportedModules) + $$(foreach m, $$(IMPORTED_MODULES), \ + $$(eval $$(call ReadSingleImportMetaData, $$m))) endef ################################################################################
--- a/make/test/BuildTestLib.gmk Thu Mar 31 01:13:19 2016 -0700 +++ b/make/test/BuildTestLib.gmk Wed Jul 05 21:30:42 2017 +0200 @@ -38,7 +38,7 @@ $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \ SETUP := GENERATE_USINGJDKBYTECODE, \ SRC := $(TEST_LIB_SOURCE_DIR)/sun, \ - BIN := $(TEST_LIB_SUPPORT), \ + BIN := $(TEST_LIB_SUPPORT)/wb_classes, \ JAR := $(TEST_LIB_SUPPORT)/wb.jar, \ ADD_JAVAC_FLAGS := $(JAVAC_WARNINGS), \ )) @@ -49,7 +49,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \ SETUP := GENERATE_USINGJDKBYTECODE, \ SRC := $(TEST_LIB_SOURCE_DIR)/share/classes/jdk/test/lib/hprof, \ - BIN := $(TEST_LIB_SUPPORT), \ + BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \ JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \ ))