From 33847a22916b070f7f907c0801b842880bb275ca Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 28 Oct 2016 10:13:05 -0700
Subject: [PATCH] mx.copylib: more solaris support
---
mx.fastr/mx_copylib.py | 3 +++
mx.fastr/suite.py | 15 +++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py
index bce03fa68c..05aa3ca410 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 b521619330..8f6eb58738 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",
+ }
+ },
},
},
},
--
GitLab