diff --git a/mx.fastr/mx_fastr_dists.py b/mx.fastr/mx_fastr_dists.py index c90cf2fc383375734d80835b764f4a0f949481eb..b04c13428653b42c7fccb2a726c3ea1d49e8835b 100644 --- a/mx.fastr/mx_fastr_dists.py +++ b/mx.fastr/mx_fastr_dists.py @@ -213,12 +213,6 @@ class FastRArchiveParticipant: shutil.rmtree(include_dir) def mx_post_parse_cmd_line(opts): - if os.environ.has_key('FASTR_RFFI'): - val = os.environ['FASTR_RFFI'] - else: - val = "" - - mx.instantiateDistribution('FASTR_RELEASE<rffi>', dict(rffi=val)) for dist in mx_fastr._fastr_suite.dists: if isinstance(dist, mx.JARDistribution): dist.set_archiveparticipant(FastRArchiveParticipant(dist)) diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py index 03a6208f072b5b7688dc96673ece4b6fa4a4f66b..b827db109703e4f0d3f90b9a7b777538a231e719 100644 --- a/mx.fastr/suite.py +++ b/mx.fastr/suite.py @@ -365,26 +365,26 @@ suite = { ], }, - "FASTR_RELEASE<rffi>": { + "FASTR_RELEASE": { "description" : "a binary release of FastR", "dependencies" : ["com.oracle.truffle.r.release"], "os_arch" : { "linux" : { "amd64" : { - "path" : "mxbuild/dists/linux/amd64/<rffi>/fastr-release.jar", + "path" : "mxbuild/dists/linux/amd64/fastr-release.jar", }, "sparcv9" : { - "path" : "mxbuild/dists/linux/sparcv9/<rffi>/fastr-release.jar", + "path" : "mxbuild/dists/linux/sparcv9/fastr-release.jar", }, }, "darwin" : { "amd64" : { - "path" : "mxbuild/dists/darwin/amd64/<rffi>/fastr-release.jar", + "path" : "mxbuild/dists/darwin/amd64/fastr-release.jar", }, }, "solaris" : { "sparcv9" : { - "path" : "mxbuild/dists/solaris/sparcv9/<rffi>/fastr-release.jar", + "path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar", }, }, },