mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 11:04:34 +02:00
7089790: integrate bsd-port changes
Co-authored-by: Greg Lewis <glewis@eyesbeyond.com> Co-authored-by: Jung-uk Kim <jkim@freebsd.org> Co-authored-by: Christos Zoulas <christos@zoulas.com> Co-authored-by: Landon Fuller <landonf@plausible.coop> Co-authored-by: The FreeBSD Foundation <board@freebsdfoundation.org> Co-authored-by: Michael Franz <mvfranz@gmail.com> Co-authored-by: Roger Hoover <rhoover@apple.com> Co-authored-by: Alexander Strange <astrange@apple.com> Reviewed-by: kvn, twisti, jrose
This commit is contained in:
parent
52f0eccb24
commit
95c56a472b
291 changed files with 26162 additions and 145 deletions
|
@ -45,13 +45,18 @@ const char *env_list[] = {
|
|||
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
|
||||
"JAVA_COMPILER", "PATH", "USERNAME",
|
||||
|
||||
// Env variables that are defined on Solaris/Linux
|
||||
// Env variables that are defined on Solaris/Linux/BSD
|
||||
"LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
|
||||
"HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
|
||||
|
||||
// defined on Linux
|
||||
"LD_ASSUME_KERNEL", "_JAVA_SR_SIGNUM",
|
||||
|
||||
// defined on Darwin
|
||||
"DYLD_LIBRARY_PATH", "DYLD_FALLBACK_LIBRARY_PATH",
|
||||
"DYLD_FRAMEWORK_PATH", "DYLD_FALLBACK_FRAMEWORK_PATH",
|
||||
"DYLD_INSERT_LIBRARIES",
|
||||
|
||||
// defined on Windows
|
||||
"OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
|
||||
|
||||
|
@ -958,7 +963,7 @@ void VMError::report_and_die() {
|
|||
const char* ptr = OnError;
|
||||
while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
|
||||
out.print_raw ("# Executing ");
|
||||
#if defined(LINUX)
|
||||
#if defined(LINUX) || defined(_ALLBSD_SOURCE)
|
||||
out.print_raw ("/bin/sh -c ");
|
||||
#elif defined(SOLARIS)
|
||||
out.print_raw ("/usr/bin/sh -c ");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue