diff options
| author | J. Duke <duke@openjdk.org> | 2017-07-05 18:09:30 +0200 |
|---|---|---|
| committer | J. Duke <duke@openjdk.org> | 2017-07-05 18:09:30 +0200 |
| commit | 56b6c34c1f90ce1db5a2bd512e0b6364f22c7f75 (patch) | |
| tree | a635ebbf1132a6d8f4e594c0da852b13607e199b | |
| parent | cd1a43e9b28c6048295e7704c32f6e16f8a8c6a3 (diff) | |
| parent | c5babb53152b2062abd2165c3c9197e7bca2682d (diff) | |
| download | libcore-56b6c34c1f90ce1db5a2bd512e0b6364f22c7f75.tar.gz | |
Merge
| -rw-r--r-- | .hgtags-top-repo | 1 | ||||
| -rw-r--r-- | common/autoconf/configure | 2 | ||||
| -rw-r--r-- | common/autoconf/configure.ac | 2 | ||||
| -rw-r--r-- | hotspot/.hgtags | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 13d4a6d1f39..432c46d8709 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -157,3 +157,4 @@ cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21 42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33 894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34 5285317ebb4e8e4f6d8d52b5616fa801e2ea844d jdk8-b35 +6a6ba0a07f33d37a2f97b1107e60c6a9a69ec84d jdk8-b36 diff --git a/common/autoconf/configure b/common/autoconf/configure index 096fc734759..13630cca07d 100644 --- a/common/autoconf/configure +++ b/common/autoconf/configure @@ -10489,7 +10489,7 @@ $as_echo "no, disabling ccaching of precompiled headers" >&6; } # Setup default logging of stdout and stderr to build.log in the output root. BUILD_LOG='$(OUTPUT_ROOT)/build.log' -BUILD_LOG_WRAPPER='$(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' +BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac index e78f4fa817f..4c6b326ecaf 100644 --- a/common/autoconf/configure.ac +++ b/common/autoconf/configure.ac @@ -1004,7 +1004,7 @@ TESTFOR_PROG_CCACHE # Setup default logging of stdout and stderr to build.log in the output root. BUILD_LOG='$(OUTPUT_ROOT)/build.log' -BUILD_LOG_WRAPPER='$(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' +BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' AC_SUBST(BUILD_LOG) AC_SUBST(BUILD_LOG_WRAPPER) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index d8da4eb47f9..5a1b5041315 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -241,3 +241,4 @@ cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06 f284b08835584517c1ca3dd67341f569e763841f jdk8-b34 f621660a297baa48fab9dca28e99d318826e8304 jdk8-b35 dff6e3459210f8dd0430b9b03ccc99280560da30 hs24-b08 +50b4400ca1ecb2ac2fde35f5e53ec8f04b86be7f jdk8-b36 |