changeset 5581:913a35723a0a

Merge
author katleman
date Mon, 28 Oct 2013 16:02:40 -0700
parents 4a1128861221 e006d2e25bc7
children 7fd913010dbb
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp	Thu Oct 24 09:10:27 2013 -0700
+++ b/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