diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py
index bce03fa68c598f8ed1e4031d8ef5ec01965dca31..05aa3ca410940f14bdaee4a075e9ad2a5b377735 100644
--- a/mx.fastr/mx_copylib.py
+++ b/mx.fastr/mx_copylib.py
@@ -117,9 +117,12 @@ def copylib(args):
                         return 0
 
     if os.environ.has_key('FASTR_RELEASE'):
+        if args[0] == 'quadmath' and platform.system() == 'SunOS':
+            return 0
         mx.abort(args[0] + ' not found in PKG_LDFLAGS_OVERRIDE, but required with FASTR_RELEASE')
 
     mx.log(args[0] + ' not found in PKG_LDFLAGS_OVERRIDE, assuming system location')
+    return 0
 
 def updatelib(args):
     '''
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index b521619330827dd75ff847ae6305e99ec8fb8dee..8f6eb5873878da8b72890a6d947576d07958d27f 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -331,6 +331,11 @@ suite = {
              "path" : "mxbuild/dists/darwin/amd64/fastr-unit-tests-native.jar",
            },
         },
+         "SunOS" : {
+           "amd64" : {
+             "path" : "mxbuild/dists/solaris/amd64/fastr-unit-tests-native.jar",
+           }
+        },
       },
     },
 
@@ -352,6 +357,11 @@ suite = {
              "path" : "mxbuild/dists/darwin/amd64/fastr-native-dev.jar",
           },
         },
+         "SunOS" : {
+           "amd64" : {
+             "path" : "mxbuild/dists/solaris/amd64/fastr-native-dev.jar",
+          },
+        },
       },
     },
 
@@ -369,6 +379,11 @@ suite = {
              "path" : "mxbuild/dists/darwin/amd64/fastr-release.jar",
            }
         },
+         "SunOS" : {
+           "amd64" : {
+             "path" : "mxbuild/dists/solaris/amd64/fastr-release.jar",
+           }
+        },
       },
     },
   },