Merge
This commit is contained in:
commit
c3d9838efd
@ -157,3 +157,4 @@ cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21
|
||||
42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33
|
||||
894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34
|
||||
5285317ebb4e8e4f6d8d52b5616fa801e2ea844d jdk8-b35
|
||||
6a6ba0a07f33d37a2f97b1107e60c6a9a69ec84d jdk8-b36
|
||||
|
2
common/autoconf/configure
vendored
2
common/autoconf/configure
vendored
@ -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)'
|
||||
|
||||
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -157,3 +157,4 @@ e45d6b406d5f91ff5256a5c82456ab1e7eb8becd jdk8-b25
|
||||
1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33
|
||||
e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34
|
||||
e3d735914edd0a621b16bb85417423f8e6af5d51 jdk8-b35
|
||||
a5a61f259961a7f46b002e5cc50b4a9bf86927b6 jdk8-b36
|
||||
|
@ -241,3 +241,4 @@ cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06
|
||||
f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
|
||||
f621660a297baa48fab9dca28e99d318826e8304 jdk8-b35
|
||||
dff6e3459210f8dd0430b9b03ccc99280560da30 hs24-b08
|
||||
50b4400ca1ecb2ac2fde35f5e53ec8f04b86be7f jdk8-b36
|
||||
|
@ -157,3 +157,4 @@ f3244c1f04864d35c41fa8d13669faf4f65b81e2 jdk8-b28
|
||||
9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33
|
||||
8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
|
||||
e187f3ede64965dc2979df9a211107cd3d38eacb jdk8-b35
|
||||
cfd288fe1d3e2b700838342e70d71d44ac991af5 jdk8-b36
|
||||
|
@ -47,7 +47,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JAXP,\
|
||||
SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
|
||||
SRC:=$(JAXP_TOPDIR)/src/share/classes,\
|
||||
SRC:=$(JAXP_TOPDIR)/src,\
|
||||
CLEAN:=.properties,\
|
||||
BIN:=$(JAXP_OUTPUTDIR)/classes,\
|
||||
SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))
|
||||
|
@ -157,3 +157,4 @@ b376d901e006cd9e0c59733c84e190aace23eec6 jdk8-b25
|
||||
ea80b2388dce711fbde8e4fd6e07c2c64ad16743 jdk8-b33
|
||||
f1d020a49c8c33667fb10c8caa255206a78a3675 jdk8-b34
|
||||
e8afc16522e190cb93c66bcb15d6fba0fe9e6833 jdk8-b35
|
||||
89b36c658e39f0a2957be55453a3a3befd9c8a6b jdk8-b36
|
||||
|
@ -157,3 +157,4 @@ ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32
|
||||
78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33
|
||||
29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
|
||||
2e3e1356ffbddb2ae95c08da72830ba9ab8b3181 jdk8-b35
|
||||
45da9cb055ee258dc09e69c1718e27eadea38e45 jdk8-b36
|
||||
|
Loading…
Reference in New Issue
Block a user