From 2a030cb94dab7ec7d4e73bd1f98f6432528a1988 Mon Sep 17 00:00:00 2001
From: Stefan Anzinger <stefan.anzinger@oracle.com>
Date: Mon, 27 Apr 2015 16:42:20 +0200
Subject: [PATCH] fix Solaris/SPARC makefile.gnur
---
com.oracle.truffle.r.native/gnur/Makefile.gnur | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index 69597c18f1..21df43ffa7 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -79,7 +79,7 @@ ifeq ($(OSNAME), SunOS)
# required for Solaris compiler >=12.2, see Appendix C of R installation guide:
# http://cran.r-project.org/doc/manuals/r-release/R-admin.html#Solaris
GNUR_FLIBS := FLIBS="-R$(SSTUDIO_HOME)prod/lib/$(SUB_ARCH) $(FLIBS_COMMON) $(FLIBS_SUB_ARCH)"
- GNUR_CONFIG_FLAGS := $(ICONV_CONFIG_FLAGS) CPPFLAGS=$(ICONV_FLAGS) $(GNUR_FLIBS) F77="sunf95 -m64 -xcode=pic32"
+ GNUR_CONFIG_FLAGS := $(ICONV_CONFIG_FLAGS) CPPFLAGS=$(ICONV_FLAGS) DYLIB_LDFLAGS=$(ICONV_FLAGS) $(GNUR_FLIBS) F77="sunf95 -m64 -xcode=pic32"
iconv: $(ICONV) iconv_config iconv_build
@@ -119,7 +119,7 @@ $(GNUR_HOME)/Makefile:
build: $(GNUR_HOME)/bin/R
$(GNUR_HOME)/bin/R: $(GNUR_HOME)/Makeconf
- (cd $(GNUR_HOME); $(MAKE) -j > gnur_make.log 2>&1)
+ (cd $(GNUR_HOME); $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1)
clean: cleangnur cleaniconv
rm -f Makeconf.done
--
GitLab