Mercurial > hg > icedtea8-forest > hotspot
changeset 8827:5b67af3317bc jdk8u66-b15
Merge
author | asaha |
---|---|
date | Mon, 21 Sep 2015 21:30:51 -0700 |
parents | 97c54a01b380 (current diff) b4137dc9b1a8 (diff) |
children | 3d13e757229c |
files | .hgtags |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 14 13:51:19 2015 -0700 +++ b/.hgtags Mon Sep 21 21:30:51 2015 -0700 @@ -737,6 +737,7 @@ a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12 529bea83b67412ffb5a7eb0ed8f8772732bbf446 jdk8u65-b13 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14 +03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
--- a/make/solaris/makefiles/trace.make Mon Sep 14 13:51:19 2015 -0700 +++ b/make/solaris/makefiles/trace.make Mon Sep 21 21:30:51 2015 -0700 @@ -56,8 +56,12 @@ ifeq ($(HAS_ALT_SRC), true) TraceGeneratedNames += \ traceRequestables.hpp \ - traceEventControl.hpp \ - traceProducer.cpp + traceEventControl.hpp + +ifneq ($(INCLUDE_TRACE), false) + TraceGeneratedNames += traceProducer.cpp +endif + endif TraceGeneratedFiles = $(TraceGeneratedNames:%=$(TraceOutDir)/%)