Merge
diff --git a/src/os/bsd/vm/os_bsd.cpp b/src/os/bsd/vm/os_bsd.cpp
index f182b2a..d1afaab 100644
--- a/src/os/bsd/vm/os_bsd.cpp
+++ b/src/os/bsd/vm/os_bsd.cpp
@@ -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
