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 d4ae7a9942344952296ad1730d134fef590bbc33..5ec080d095e50baf17b7f2b6d6a1e0fe02ede27d 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 30fc181f0d7849f5e512ea51ce407a71e755302b..40f99dfb2a763205016888453f9d7ac2a1df77e0 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)