Skip to content

Commit

Permalink
Workaround for JRUBY-3084. By setting jna.platform.library.path to be…
Browse files Browse the repository at this point in the history
… empty, and specifying libc.so.6 instead of 'c' on linux, it just pushes the library name through to dlopen(), without trying to locate it in the filesystem first.

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7931 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information
vp-of-awesome committed Oct 28, 2008
1 parent 05ac543 commit 2044769
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions bin/jruby
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ set -- "${ruby_args[@]}"

JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
JAVA_OPTS="$JAVA_OPTS -Djna.boot.library.path=$JRUBY_HOME/lib/native/$JNA_PATH"
if [ `uname -s` = Linux ]; then
JAVA_OPTS="$JAVA_OPTS -Djna.platform.library.path=:"
fi

if $cygwin; then
JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
Expand Down
Binary file modified build_lib/jna-posix.jar
Binary file not shown.

0 comments on commit 2044769

Please sign in to comment.