Mercurial > hg > openjdk > lambda > hotspot

changeset 5702:e006d2e25bc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8025673: [macosx] Disable X11 AWT toolkit Summary: Disable but not completely remove the XAWT and headless toolkits on Mac OS X Reviewed-by: dholmes Contributed-by: david.dehaven@oracle.com
author dholmes
date Thu, 24 Oct 2013 20:47:18 -0400
parents 4589b398ab03
children 913a35723a0a
files src/os/bsd/vm/os_bsd.cpp
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp	Tue Oct 22 13:56:26 2013 -0700
+++ b/src/os/bsd/vm/os_bsd.cpp	Thu Oct 24 20:47:18 2013 -0400
@@ -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