changeset 20892:e8eeec1da3d9

8019540: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated. Reviewed-by: dholmes, sla
author erikj
date Thu, 17 Oct 2013 16:15:57 +0200
parents 9d7cc1b4291b
children c4ac5cc249b4
files jdk/makefiles/CopyIntoClasses.gmk
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/makefiles/CopyIntoClasses.gmk	Wed Oct 16 20:24:46 2013 +0200
+++ b/jdk/makefiles/CopyIntoClasses.gmk	Thu Oct 17 16:15:57 2013 +0200
@@ -91,7 +91,7 @@
       $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
 endif
 
-ifndef OPENJDK
+ifeq ($(ENABLE_JFR), true)
   JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
   COPY_FILES += \
       $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd