diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile
index 46b4f1d95fcb7c981511ee1fff0baad3fcaf325b..59bbfb67219786272abb24f52ede7b3d59e96899 100644
--- a/com.oracle.truffle.r.native/fficall/Makefile
+++ b/com.oracle.truffle.r.native/fficall/Makefile
@@ -60,7 +60,7 @@ ifeq ($(OS_NAME),Darwin)
 # check if we captured libpcre/libz, rpath those in libR
 	mx rupdatelib $(FASTR_LIB_DIR)
 else
-	$(DYLIB_LD) $(DYLIB_LDFLAGS) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack  -lpcre -lz
+	$(DYLIB_LD) $(DYLIB_LDFLAGS) $(shell echo $(PKG_LDFLAGS_OVERRIDE)) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack  -lpcre -lz
 endif
 
 jni.done:
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java
index ad64f405fd567fea691159396e08bf58e9d8464a..4d277298b2dd4dd55e699bbc27c5d82b9ff595df 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java
@@ -92,7 +92,11 @@ public enum RVersionInfo {
                          * GnuR, this value on Linux has to be x86_64-unknown-linux-gnu
                          */
                         if (osName.equals("linux")) {
-                            data.value = "x86_64-unknown-linux-gnu";
+                            if (Arch.value.equals("sparcv9")) {
+                                data.value = "sparc64-unknown-linux-gnu";
+                            } else {
+                                data.value = "x86_64-unknown-linux-gnu";
+                            }
                         } else if (osName.toLowerCase().equals("sunos")) {
                             data.value = "sparc-sun-solaris2.11";
                         } else {
diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py
index dcb597d0a1bed5778d86d3a1baefdb83f9903082..34df957df61dade528f4c8142dafe4f35e59a00c 100644
--- a/mx.fastr/mx_copylib.py
+++ b/mx.fastr/mx_copylib.py
@@ -118,7 +118,7 @@ def copylib(args):
                         return 0
 
     if os.environ.has_key('FASTR_RELEASE'):
-        if args[0] == 'quadmath' and platform.system() == 'SunOS':
+        if args[0] == 'quadmath' and (mx.get_arch() == 'sparcv9' or mx.get_os() == 'solaris'):
             return 0
         mx.abort(args[0] + ' not found in PKG_LDFLAGS_OVERRIDE, but required with FASTR_RELEASE')
 
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 2166292810b8b4f6b8c48aad1d718472f0ef01f9..58463ad8e923513c79405151cd8f992c9ec8789e 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -336,42 +336,48 @@ suite = {
          "linux" : {
            "amd64" : {
              "path" : "mxbuild/dists/linux/amd64/fastr-unit-tests-native.jar",
-           }
+           },
+           "sparcv9" : {
+             "path" : "mxbuild/dists/linux/sparcv9/fastr-unit-tests-native.jar",
+           },
         },
-         "darwin" : {
+        "darwin" : {
            "amd64" : {
              "path" : "mxbuild/dists/darwin/amd64/fastr-unit-tests-native.jar",
            },
         },
-         "solaris" : {
+        "solaris" : {
            "sparcv9" : {
              "path" : "mxbuild/dists/solaris/sparcv9/fastr-unit-tests-native.jar",
-           }
+           },
         },
       },
     },
 
     "FASTR_NATIVE_DEV": {
-        "description" : "support for overriding the native project implementation in a separate suite",
-        "dependencies" : ["com.oracle.truffle.r.native"],
-        "exclude" : [
+      "description" : "support for overriding the native project implementation in a separate suite",
+      "dependencies" : ["com.oracle.truffle.r.native"],
+      "exclude" : [
         "GNUR",
         "GNU_ICONV",
-        ],
-       "os_arch" : {
-         "linux" : {
-           "amd64" : {
-             "path" : "mxbuild/dists/linux/amd64/fastr-native-dev.jar",
-           },
+      ],
+      "os_arch" : {
+        "linux" : {
+          "amd64" : {
+            "path" : "mxbuild/dists/linux/amd64/fastr-native-dev.jar",
+          },
+          "sparcv9" : {
+            "path" : "mxbuild/dists/linux/sparcv9/fastr-native-dev.jar",
+          },
         },
-         "darwin" : {
-           "amd64" : {
-             "path" : "mxbuild/dists/darwin/amd64/fastr-native-dev.jar",
+        "darwin" : {
+          "amd64" : {
+            "path" : "mxbuild/dists/darwin/amd64/fastr-native-dev.jar",
           },
         },
-         "solaris" : {
-           "sparcv9" : {
-             "path" : "mxbuild/dists/solaris/sparcv9/fastr-native-dev.jar",
+        "solaris" : {
+          "sparcv9" : {
+            "path" : "mxbuild/dists/solaris/sparcv9/fastr-native-dev.jar",
           },
         },
       },
@@ -382,19 +388,22 @@ suite = {
       "dependencies" : ["com.oracle.truffle.r.release"],
        "os_arch" : {
          "linux" : {
-           "amd64" : {
-             "path" : "mxbuild/dists/linux/amd64/fastr-release.jar",
-           }
+          "amd64" : {
+            "path" : "mxbuild/dists/linux/amd64/fastr-release.jar",
+          },
+          "sparcv9" : {
+            "path" : "mxbuild/dists/linux/sparcv9/fastr-release.jar",
+          },
         },
-         "darwin" : {
-           "amd64" : {
-             "path" : "mxbuild/dists/darwin/amd64/fastr-release.jar",
-           }
+        "darwin" : {
+          "amd64" : {
+            "path" : "mxbuild/dists/darwin/amd64/fastr-release.jar",
+          },
         },
-         "solaris" : {
-           "sparcv9" : {
-             "path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar",
-           }
+        "solaris" : {
+          "sparcv9" : {
+            "path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar",
+          },
         },
       },
     },