From 59d07024f75b2d30eb36363e8e07dd54a9a11ec0 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 8 Nov 2016 17:37:24 -0800
Subject: [PATCH] set XZ_HOME package download, fix -m64 regression in GNU R
build for Solaris, solaris arch is sparcv9
---
com.oracle.truffle.r.native/gnur/Makefile.gnur | 4 ++--
mx.fastr/suite.py | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index 62071263f0..29c57579c3 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -81,8 +81,8 @@ ifeq ($(OSNAME), SunOS)
ICONV := libiconv-1.14
$(shell mkdir -p iconv_install)
ICONV_INSTALL := $(abspath iconv_install)
- ICONV_CFLAGS := "$(CFLAGS) -m64 -xcode=pic32 -I$(ICONV_INSTALL)/include"
- ICONV_LDFLAGS := -L$(ICONV_INSTALL)/lib
+ ICONV_CFLAGS := "$(CFLAGS) -m64 -xcode=pic32 -I$(ICONV_INSTALL)/include -I$(XZ_HOME)/include"
+ ICONV_LDFLAGS := "-m64 -L$(ICONV_INSTALL)/lib -L$(XZ_HOME)/lib"
ICONV_CONFIG_FLAGS := CC=cc CXX=CC CFLAGS=$(ICONV_CFLAGS) LDFLAGS=$(ICONV_LDFLAGS)
# 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
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 63ef682bce..c98dfe69d8 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -344,8 +344,8 @@ suite = {
},
},
"solaris" : {
- "amd64" : {
- "path" : "mxbuild/dists/solaris/amd64/fastr-unit-tests-native.jar",
+ "sparcv9" : {
+ "path" : "mxbuild/dists/solaris/sparcv9/fastr-unit-tests-native.jar",
}
},
},
@@ -370,8 +370,8 @@ suite = {
},
},
"solaris" : {
- "amd64" : {
- "path" : "mxbuild/dists/solaris/amd64/fastr-native-dev.jar",
+ "sparcv9" : {
+ "path" : "mxbuild/dists/solaris/sparcv9/fastr-native-dev.jar",
},
},
},
@@ -392,8 +392,8 @@ suite = {
}
},
"solaris" : {
- "amd64" : {
- "path" : "mxbuild/dists/solaris/amd64/fastr-release.jar",
+ "sparcv9" : {
+ "path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar",
}
},
},
--
GitLab