Skip to content
Snippets Groups Projects
Commit 59d07024 authored by Mick Jordan's avatar Mick Jordan
Browse files

set XZ_HOME package download, fix -m64 regression in GNU R build for Solaris,...

set XZ_HOME package download, fix -m64 regression in GNU R build for Solaris, solaris arch is sparcv9
parent c20e4dcb
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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",
}
},
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment