changeset 5068:2061af64cccd

7163471: Licensee source bundle failed around 7u4 Reviewed-by: dholmes, sla, brutisso, erikj
author nloodin
date Fri, 08 Jun 2012 16:59:13 +0200
parents 1f7e7005f630
children 173daa884b91
files make/com/oracle/Makefile
diffstat 1 files changed, 18 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/oracle/Makefile	Sat Jun 09 04:51:24 2012 -0700
+++ b/make/com/oracle/Makefile	Fri Jun 08 16:59:13 2012 +0200
@@ -30,6 +30,24 @@
 #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)
+
+JFR =
+ifndef OPENJDK
+  ifndef JAVASE_EMBEDDED
+    ifeq ($(JFR_SRCDIRS_EXIST), true)
+      ifneq (${ARCH},arm)
+        JFR = jfr
+      endif
+    endif
+  endif
+endif
+
 # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
 UCRYPTO =
 ifndef OPENJDK
@@ -38,15 +56,6 @@
   endif
 endif
 
-JFR =
-ifndef OPENJDK
-ifndef JAVASE_EMBEDDED 
-ifneq (${ARCH},arm)
-	JFR = jfr
-endif
-endif
-endif
-
 SUBDIRS = $(JFR) net nio util $(UCRYPTO)
 
 include $(BUILDDIR)/common/Subdirs.gmk