From b13b5e220ea162f19bbcfb2d55fc1f4677b448f4 Mon Sep 17 00:00:00 2001
From: Stefan Anzinger <stefan.anzinger@oracle.com>
Date: Tue, 21 Apr 2015 11:21:15 +0200
Subject: [PATCH] Translate name from 'sunos' to 'solaris' as
 $JAVA_HOME/include/solaris has to be used rather than
 $JAVA_HOME/include/sunos

---
 com.oracle.truffle.r.native/fficall/jni/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/com.oracle.truffle.r.native/fficall/jni/Makefile b/com.oracle.truffle.r.native/fficall/jni/Makefile
index 3f14954c3d..a01d09c277 100644
--- a/com.oracle.truffle.r.native/fficall/jni/Makefile
+++ b/com.oracle.truffle.r.native/fficall/jni/Makefile
@@ -38,8 +38,13 @@ C_LIBNAME := librfficall$(DYLIB_EXT)
 C_OBJECTS := $(subst $(SRC),$(OBJ),$(C_SOURCES:.c=.o))
 C_LIB := $(TOPDIR)/builtinlibs/$(OBJ)/$(C_LIBNAME)
 CFLAGS := $(CFLAGS) -DFASTR
+ifeq ($(OS_DIR),sunos)
+OS_INCLUDE := solaris
+else
+OS_INCLUDE := $(OS_DIR)
+endif
 
-JNI_INCLUDES = -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(OS_DIR)
+JNI_INCLUDES = -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(OS_INCLUDE)
 FFI_INCLUDES = -I$(TOPDIR)/include/jni/include -I$(TOPDIR)/include/jni/include/R_ext
 
 INCLUDES := $(JNI_INCLUDES) $(FFI_INCLUDES)
-- 
GitLab