From dd11ddc683239752619ce43bcb955c234e2086a3 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Mon, 6 Apr 2015 08:37:43 -0700
Subject: [PATCH] fix native clean; build GnuR with --enable-R-shlib

---
 com.oracle.truffle.r.native/gnur/Makefile  | 4 ++--
 com.oracle.truffle.r.native/library/lib.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/com.oracle.truffle.r.native/gnur/Makefile b/com.oracle.truffle.r.native/gnur/Makefile
index 0b0329e6fc..5d07efb3a0 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile
+++ b/com.oracle.truffle.r.native/gnur/Makefile
@@ -39,11 +39,11 @@ all: Makefile $(GNUR_DIR) config build copy
 
 $(GNUR_DIR): 
 	tar xf $(TOPDIR)/../lib/R-$(R_VERSION).tar.gz
-	
+
 config: $(GNUR_DIR)/Makefile
 
 $(GNUR_DIR)/Makefile: 
-	(cd $(GNUR_DIR); ./configure --with-x=no --without-recommended-packages >& /dev/null)
+	(cd $(GNUR_DIR); ./configure --with-x=no --without-recommended-packages --enable-R-shlib >& /dev/null)
 
 build: $(GNUR_DIR)/bin/R
 
diff --git a/com.oracle.truffle.r.native/library/lib.mk b/com.oracle.truffle.r.native/library/lib.mk
index 1419d513be..e3b2f9d341 100644
--- a/com.oracle.truffle.r.native/library/lib.mk
+++ b/com.oracle.truffle.r.native/library/lib.mk
@@ -87,6 +87,6 @@ $(OBJ)/%.o: $(SRC)/%.f
 	$(FC) $(CFLAGS) -c $< -o $@
 
 clean: 
-	rm -f $(LIBDIR)/*
+	rm -rf $(LIBDIR)/*
 	rm -rf $(FASTR_LIBDIR)/$(PKG)
 
-- 
GitLab