From 80f5fd4872704562e1cceb40ab42520c424d5365 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 18 Jul 2017 16:11:26 -0700
Subject: [PATCH] set polyglot.llvm.libraryPath in llvm mode
---
.../com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java | 1 -
mx.fastr/mx_fastr.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java
index 5be5a0e670..d8ca3ddd73 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java
@@ -28,7 +28,6 @@ import com.oracle.truffle.api.interop.Message;
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.r.runtime.RInternalError;
-import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.ffi.DLL;
import com.oracle.truffle.r.runtime.ffi.DLL.SymbolHandle;
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index b4cfcad4b0..6f42889ae2 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -150,7 +150,7 @@ def set_graal_options():
def _sulong_options():
if _mx_sulong:
- return ['-XX:-UseJVMCIClassLoader']
+ return ['-Dpolyglot.llvm.libraryPath=' + _mx_sulong.dir + '/mxbuild/sulong-libs']
else:
return []
--
GitLab