--- old/make/com/oracle/Makefile	2012-06-04 10:35:51.000000000 +0200
+++ new/make/com/oracle/Makefile	2012-06-04 10:35:51.000000000 +0200
@@ -30,6 +30,13 @@
 #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
 include $(BUILDDIR)/common/Defs.gmk
 
+JFR_SRCDIRS_EXIST = $(shell \
+  if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
+    echo true; \
+  else \
+    echo false; \
+  fi)
+
 # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
 UCRYPTO =
 ifndef OPENJDK
@@ -40,9 +47,11 @@
 
 JFR =
 ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
-	JFR = jfr
-endif
+  ifndef JAVASE_EMBEDDED
+    ifeq ($(JFR_SRCDIRS_EXIST), true)
+      JFR = jfr
+    endif
+  endif
 endif
 
 SUBDIRS = $(JFR) net nio util $(UCRYPTO)