From 19057b550c45f6b9f8e87d14473148dd55b81a48 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Mon, 20 Jun 2016 15:23:44 -0700
Subject: [PATCH] fix more errors
---
.../oracle/truffle/r/engine/shell/StringConsoleHandler.java | 5 -----
com.oracle.truffle.r.test.native/embedded/Makefile | 4 +++-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/StringConsoleHandler.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/StringConsoleHandler.java
index d4ae7a9942..5ec080d095 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/StringConsoleHandler.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/StringConsoleHandler.java
@@ -99,11 +99,6 @@ class StringConsoleHandler implements ConsoleHandler {
this.prompt = prompt;
}
- @Override
- public int getWidth() {
- return RContext.CONSOLE_WIDTH;
- }
-
@Override
public String getInputDescription() {
return inputDescription;
diff --git a/com.oracle.truffle.r.test.native/embedded/Makefile b/com.oracle.truffle.r.test.native/embedded/Makefile
index 30fc181f0d..40f99dfb2a 100644
--- a/com.oracle.truffle.r.test.native/embedded/Makefile
+++ b/com.oracle.truffle.r.test.native/embedded/Makefile
@@ -47,12 +47,14 @@ INCLUDE_DIR := $(NATIVE_PROJECT)/include
all: $(OBJ)/main
+$(OBJ)/main: | $(OBJ)
+
$(OBJ):
mkdir -p $(OBJ)
$(OBJ)/main: $(SRC)/main.c
- $(CC) $(CFLAGS) -I$(INCLUDE_DIR) $< -o main -L $(FASTR_LIB_DIR) -ldl -lR $(LD_FLAGS)
+ $(CC) $(CFLAGS) -I$(INCLUDE_DIR) $< -o $(OBJ)/main -L $(FASTR_LIB_DIR) -ldl -lR $(LD_FLAGS)
clean:
rm -rf $(OBJ)
--
GitLab