diff --git a/com.oracle.truffle.r.pkgs/rJava/src/Makevars b/com.oracle.truffle.r.pkgs/rJava/src/Makevars index 238e93d69d420cb6688da8529b34dc0ec0f53409..17ea02876e66bf1add17ce411f2d42d8d66371cb 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