From 0db4b4091500b059b00c06ec9c337e05fe82265c Mon Sep 17 00:00:00 2001
From: Tomas Stupka <tomas.stupka@oracle.com>
Date: Tue, 24 Apr 2018 13:07:37 +0200
Subject: [PATCH] Make sure rJava installation is as user-friendly as possible
---
com.oracle.truffle.r.pkgs/rJava/src/Makevars | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.pkgs/rJava/src/Makevars b/com.oracle.truffle.r.pkgs/rJava/src/Makevars
index 238e93d69d..17ea02876e 100644
--- a/com.oracle.truffle.r.pkgs/rJava/src/Makevars
+++ b/com.oracle.truffle.r.pkgs/rJava/src/Makevars
@@ -1,6 +1,6 @@
JAVA_SRC=$(wildcard java/*.java)
JFLAGS=-source 1.6 -target 1.6
-JAVAC=javac
+JAVAC=${JAVA_HOME}/bin/javac
all: $(SHLIB)
$(SHLIB): java
@@ -8,7 +8,7 @@ $(SHLIB): java
.PHONY: all java
java: $(JAVA_SRC)
- $(JAVAC) $(JFLAGS) $(JAVA_SRC)
+ $(JAVAC) $(JFLAGS) $(JAVA_SRC) || (echo "ERROR: compilation failed, do you have properly configured JAVA_HOME environment variable?"; exit 1)
rm -rfv ../inst/java
mkdir -p ../inst/java
mv java/*.class ../inst/java
--
GitLab