Mercurial > hg > truffle

changeset 13025:3b32d287da89 hs25-b57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 01 Nov 2013 08:26:54 -0700
parents ddc3758f68db (diff) 0836a3c28c6a (current diff)
children afd012c940e4
files src/os/bsd/vm/os_bsd.cpp
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 31 15:04:43 2013 -0700
+++ b/.hgtags	Fri Nov 01 08:26:54 2013 -0700
@@ -389,3 +389,4 @@
 23b8db5ea31d3079f1326afde4cd5c67b1dac49c hs25-b55
 4589b398ab03aba6a5da8c06ff53603488d1b8f4 jdk8-b113
 82a9cdbf683e374a76f2009352de53e16bed5a91 hs25-b56
+7fd913010dbbf75260688fd2fa8964763fa49a09 jdk8-b114
--- a/src/os/bsd/vm/os_bsd.cpp	Thu Oct 31 15:04:43 2013 -0700
+++ b/src/os/bsd/vm/os_bsd.cpp	Fri Nov 01 08:26:54 2013 -0700
@@ -4744,6 +4744,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];
@@ -4775,6 +4779,7 @@
     if (::stat(libmawtpath, &statbuf) == 0) return false;
 
     return true;
+#endif
 }
 
 // Get the default path to the core file