native build fixes for unit tests

.hgignore

@@ -91,6 +91,8 @@ R.tokens
 findbugs.html
 com.oracle.truffle.r.native/builtinlibs/lib/*
 com.oracle.truffle.r.native/library/*/lib/*
+com.oracle.truffle.r.native/platform.mk
+com.oracle.truffle.r.native/gnur/Makeconf.done
 com.oracle.truffle.r.native/include/jni/include
 com.oracle.truffle.r.native/include/jni/linked
 com.oracle.truffle.r.test.native/packages/*/lib/*

com.oracle.truffle.r.native/gnur/Makefile

@@ -25,8 +25,11 @@
 
 all: 
 	$(MAKE) -f Makefile.gnur
+	$(MAKE) -f Makefile.platform
 	$(MAKE) -f Makefile.libs
 
 clean:
 	$(MAKE) -f Makefile.gnur clean
 	$(MAKE) -f Makefile.libs clean
+	$(MAKE) -f Makefile.platform clean
+	
\ No newline at end of file

com.oracle.truffle.r.native/gnur/Makefile.libs

@@ -21,7 +21,7 @@
 # questions.
 #
 
-# Copies the Lbas and lapack libraries and builds the pcre library
+# Copies the Blas and lapack libraries and builds the pcre library
 
 include $(TOPDIR)/platform.mk
 

com.oracle.truffle.r.native/gnur/Makefile.platform

@@ -34,7 +34,7 @@ $(TOPDIR)/platform.mk: sedMakeconf
 	sed -f sedMakeconf $(GNUR_DIR)/Makeconf >& /dev/null
 	echo OS_NAME = $(OS_NAME) >> platform.mk.temp
 	echo OS_DIR = $(OS_DIR) >> platform.mk.temp
-	cp platform.mk.temp $(TOPDIR)/platform.mk
+	mv platform.mk.temp $(TOPDIR)/platform.mk
 
 clean:
 	rm -f $(TOPDIR)/platform.mk

com.oracle.truffle.r.native/library/base/Makefile

@@ -21,13 +21,17 @@
 # questions.
 #
 
-PKG_EXTRAS = $(FASTR_LIBDIR)/$(PKG)/R/Rprofile
+RPROFILE := $(FASTR_LIBDIR)/base/R/Rprofile
+RPROFILE_ORIG := $(RPROFILE).orig
+PKG_EXTRAS = $(RPROFILE)
 
 include ../lib.mk
 
 # edit the Rprofile to add fastr as a default package
+# sed's edit in place option with backup is not portable
 
-$(PKG_EXTRAS): $(FASTR_LIBDIR)/$(PKG)/R/Rprofile.orig
+$(PKG_EXTRAS): $(RPROFILE_ORIG)
 
-$(FASTR_LIBDIR)/$(PKG)/R/Rprofile.orig:
-	sed -f sed_profile -i .orig $(FASTR_LIBDIR)/$(PKG)/R/Rprofile
+$(RPROFILE_ORIG):
+	cp $(RPROFILE) $(RPROFILE_ORIG)
+	sed -f sed_profile $(RPROFILE_ORIG) > $(RPROFILE)

com.oracle.truffle.r.test.native/packages/testrffi/src/src/Makefile

@@ -47,7 +47,7 @@ endif
 all: $(C_LIB)
 
 $(C_LIB): $(C_OBJECTS)
-	$(CC) $(LDFLAGS)  -o $(C_LIB) $(C_OBJECTS)
+	$(DYLIB_LD) $(DYLIB_LDFLAGS)  -o $(C_LIB) $(C_OBJECTS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@