Merge
authorkatleman
Mon, 28 Oct 2013 16:02:40 -0700
changeset 21124 44627929cb9d
parent 21059 74a2628d828a (current diff)
parent 21123 1370c7b2f97c (diff)
child 21125 07a68f9401e4
Merge
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp	Thu Oct 24 09:10:27 2013 -0700
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp	Mon Oct 28 16:02:40 2013 -0700
@@ -4746,6 +4746,10 @@
 // as libawt.so, and renamed libawt_xawt.so
 //
 bool os::is_headless_jre() {
+#ifdef __APPLE__
+    // We no longer build headless-only on Mac OS X
+    return false;
+#else
     struct stat statbuf;
     char buf[MAXPATHLEN];
     char libmawtpath[MAXPATHLEN];
@@ -4777,6 +4781,7 @@
     if (::stat(libmawtpath, &statbuf) == 0) return false;
 
     return true;
+#endif
 }
 
 // Get the default path to the core file