Mercurial > hg > truffle
changeset 12992:7fd913010dbb jdk8-b114
Merge
author | katleman |
---|---|
date | Tue, 29 Oct 2013 14:56:30 -0700 |
parents | bde83ddf920c (current diff) 913a35723a0a (diff) |
children | ddc3758f68db ea1b8c643fc8 |
files | |
diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp Fri Oct 25 13:29:18 2013 -0700 +++ b/src/os/bsd/vm/os_bsd.cpp Tue Oct 29 14:56:30 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