changeset 7086:5c11f144d721

. jspawnhelper is an architecture specific binary on *BSD, so it should live under jre/lib/<arch>/ like jexec and similar to the way solaris has it located.
author kurt
date Mon, 28 Apr 2014 16:32:29 -0400
parents 3d5dd1ee4b1b
children af16eb23cbc7
files make/java/java/Makefile src/solaris/classes/java/lang/UNIXProcess.java.bsd
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/java/java/Makefile	Mon Apr 28 11:35:02 2014 -0400
+++ b/make/java/java/Makefile	Mon Apr 28 16:32:29 2014 -0400
@@ -465,7 +465,6 @@
     BUILDHELPER = 1
 endif
 ifeq ($(PLATFORM), bsd)
-    HELPER_EXE = $(LIBDIR)/jspawnhelper
     BUILDHELPER = 1
 endif
 
--- a/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Mon Apr 28 11:35:02 2014 -0400
+++ b/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Mon Apr 28 16:32:29 2014 -0400
@@ -94,7 +94,14 @@
             public LaunchMechanism run() {
                 String javahome = System.getProperty("java.home");
 
-                helperpath = toCString(javahome + "/lib/jspawnhelper");
+                String osname = System.getProperty("os.name");
+                if (osname.endsWith("BSD")) {
+                    String osArch = System.getProperty("os.arch");
+                    helperpath = toCString(javahome + "/lib/" + osArch + "/jspawnhelper");
+                } else {
+                    helperpath = toCString(javahome + "/lib/jspawnhelper");
+                }
+
                 String s = System.getProperty(
                     "jdk.lang.Process.launchMechanism", "posix_spawn");