Mercurial > hg > release > icedtea7-forest-2.2 > hotspot
changeset 3443:f5fba31ac5ce
Merge
author | dcubed |
---|---|
date | Sun, 25 Mar 2012 19:55:03 -0700 |
parents | bd649a0a58e2 (current diff) 86ce3208eb18 (diff) |
children | de5748cca211 |
files | |
diffstat | 1 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp Sat Mar 24 07:30:52 2012 -0700 +++ b/src/os/bsd/vm/os_bsd.cpp Sun Mar 25 19:55:03 2012 -0700 @@ -568,6 +568,25 @@ sprintf(ld_library_path, "%s:%s", v, t); free(t); } + +#ifdef __APPLE__ + // Apple's Java6 has "." at the beginning of java.library.path. + // OpenJDK on Windows has "." at the end of java.library.path. + // OpenJDK on Linux and Solaris don't have "." in java.library.path + // at all. To ease the transition from Apple's Java6 to OpenJDK7, + // "." is appended to the end of java.library.path. Yes, this + // could cause a change in behavior, but Apple's Java6 behavior + // can be achieved by putting "." at the beginning of the + // JAVA_LIBRARY_PATH environment variable. + { + char *t = ld_library_path; + // that's +3 for appending ":." and the trailing '\0' + ld_library_path = (char *) malloc(strlen(t) + 3); + sprintf(ld_library_path, "%s:%s", t, "."); + free(t); + } +#endif + Arguments::set_library_path(ld_library_path); }