[GR-4680] Back out templated distribution.

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))

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",
           },
         },
       },