changeset 23439:565881d71b60

Merge
author asaha
date Thu, 24 Sep 2015 09:47:10 -0700
parents acf5ee723439 3d13e757229c
children 72716c03ef28
files .hgtags
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 09 10:58:32 2015 -0700
+++ b/.hgtags	Thu Sep 24 09:47:10 2015 -0700
@@ -736,6 +736,8 @@
 a106723ba50719c479614d1f599e951edb51506c jdk8u65-b11
 a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12
 529bea83b67412ffb5a7eb0ed8f8772732bbf446 jdk8u65-b13
+ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14
+03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15
 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
@@ -748,4 +750,6 @@
 8a23b6392c590b7bf5f6ad2c4746dc03981a7f60 jdk8u66-b11
 ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12
 4d699853544cf869d4edaf23b7cc9cfbb2900a2b jdk8u66-b13
+9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14
+5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15
 b8f426369187c32551f0a3d571d933908988c81c jdk8u72-b00
--- a/make/solaris/makefiles/trace.make	Wed Sep 09 10:58:32 2015 -0700
+++ b/make/solaris/makefiles/trace.make	Thu Sep 24 09:47:10 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)/%)