From c52b95f8c4e8e79a4041692118ec53053dae9fd7 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 5 Oct 2016 11:59:41 -0700
Subject: [PATCH] separate native distributions by architecture
---
mx.fastr/suite.py | 40 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index df4f2e62ef..1e82d53ac2 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -437,6 +437,18 @@ suite = {
"dependencies" : ["com.oracle.truffle.r.test.native"],
"distDependencies" : ["FASTR_NATIVE_DEV"],
"exclude" : ["GNUR", "GNU_ICONV"],
+ "os_arch" : {
+ "linux" : {
+ "amd64" : {
+ "path" : "mxbuild/dists/linux/amd64/fastr-unit-tests-native.jar",
+ }
+ },
+ "darwin" : {
+ "amd64" : {
+ "path" : "mxbuild/dists/darwin/amd64/fastr-unit-tests-native.jar",
+ },
+ },
+ },
},
"FASTR_NATIVE_DEV": {
@@ -446,12 +458,36 @@ suite = {
"GNUR",
"GNU_ICONV",
],
+ "os_arch" : {
+ "linux" : {
+ "amd64" : {
+ "path" : "mxbuild/dists/linux/amd64/fastr-native-dev.jar",
+ },
+ },
+ "darwin" : {
+ "amd64" : {
+ "path" : "mxbuild/dists/darwin/amd64/fastr-native-dev.jar",
+ },
+ },
+ },
},
"FASTR_RELEASE": {
"description" : "a binary release of FastR",
"dependencies" : ["com.oracle.truffle.r.release"],
+ "os_arch" : {
+ "linux" : {
+ "amd64" : {
+ "path" : "mxbuild/dists/linux/amd64/fastr-release.jar",
+ }
+ },
+ "darwin" : {
+ "amd64" : {
+ "path" : "mxbuild/dists/darwin/amd64/fastr-release.jar",
+ }
+ },
+ },
},
-},
-
+ },
}
+
--
GitLab