From ec6611185d5886c45527247c22a4d2bdf66f5bd4 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Sun, 8 Apr 2018 10:35:45 +0200
Subject: [PATCH] Hardcode classpath entries in the legacy launchers.
---
com.oracle.truffle.r.release/src/R_legacy | 2 +-
com.oracle.truffle.r.release/src/Rscript_legacy | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.release/src/R_legacy b/com.oracle.truffle.r.release/src/R_legacy
index e26c7151e0..99ecc9d7f8 100755
--- a/com.oracle.truffle.r.release/src/R_legacy
+++ b/com.oracle.truffle.r.release/src/R_legacy
@@ -36,7 +36,7 @@ done
JAVA_HOME="$( dirname "$JRE" )"
GRAALVMCP=""
-TMPCP="%%GRAALVMCP"
+TMPCP="jre/lib/truffle/truffle-api.jar:jre/languages/R/fastr.jar"
for cp in ${TMPCP//:/ }
do
GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:"
diff --git a/com.oracle.truffle.r.release/src/Rscript_legacy b/com.oracle.truffle.r.release/src/Rscript_legacy
index 3f088fad50..0f0a61f602 100755
--- a/com.oracle.truffle.r.release/src/Rscript_legacy
+++ b/com.oracle.truffle.r.release/src/Rscript_legacy
@@ -36,7 +36,7 @@ done
JAVA_HOME="$( dirname "$JRE" )"
GRAALVMCP=""
-TMPCP="%%GRAALVMCP"
+TMPCP="jre/lib/truffle/truffle-api.jar:jre/languages/R/fastr.jar"
for cp in ${TMPCP//:/ }
do
GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:"
--
GitLab