Skip to content

Commit 72841ed

Browse files
committed
Prefix jffi boot path with lib/native for jruby/jruby#626
1 parent 9d2ff47 commit 72841ed

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

argparser.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,12 +391,14 @@ void ArgParser::prepareOptions() {
391391

392392
option = OPT_JFFI_PATH;
393393
#ifdef WIN32
394-
option += (platformDir + "\\lib\\native\\i386-Windows;"
394+
option += (platformDir + "\\lib\\native;"
395+
+ platformDir + "\\lib\\native\\i386-Windows;"
395396
+ platformDir + "\\lib\\native\\x86_64-Windows");
396397
#else
397398
struct utsname name;
398399
if (uname(&name) == 0) {
399-
string ffiPath, ffiBase(platformDir + "/lib/native");
400+
string ffiBase(platformDir + "/lib/native");
401+
string ffiPath = ffiBase;
400402
DIR* dir = opendir(ffiBase.c_str());
401403
struct dirent* ent;
402404
if (dir != NULL) {

0 commit comments

Comments
 (0)