# HG changeset patch
# User asaha
# Date 1442903469 25200
# Node ID 67df26e363fb7e722032fd286673642fc999957c
# Parent  65932a133b748450e60c83e424aadbd36fc4d21d# Parent  f9f2f9738f5ce17e1b57731af6ee6af78e2a7aa3
Merge

diff -r 65932a133b74 -r 67df26e363fb .hgtags
--- a/.hgtags	Sun Sep 20 22:55:06 2015 -0700
+++ b/.hgtags	Mon Sep 21 23:31:09 2015 -0700
@@ -742,6 +742,7 @@
 a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12
 529bea83b67412ffb5a7eb0ed8f8772732bbf446 jdk8u65-b13
 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14
+03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15
 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
@@ -755,4 +756,5 @@
 ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12
 4d699853544cf869d4edaf23b7cc9cfbb2900a2b jdk8u66-b13
 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14
+5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15
 9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00
diff -r 65932a133b74 -r 67df26e363fb make/solaris/makefiles/trace.make
--- a/make/solaris/makefiles/trace.make	Sun Sep 20 22:55:06 2015 -0700
+++ b/make/solaris/makefiles/trace.make	Mon Sep 21 23:31:09 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)/%)