From ef65b6d9523b872bc14222218da5862b40bf4d3e Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Thu, 15 Mar 2018 16:02:05 +0100
Subject: [PATCH] Simplify conditions
---
mx.fastr/mx_fastr.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 7dd035c9cb..544dff9593 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -548,14 +548,11 @@ def nativebuild(args):
def mx_post_parse_cmd_line(opts):
mx_fastr_dists.mx_post_parse_cmd_line(opts)
- if mx.suite("sulong", fatalIfMissing=False):
+ if mx.suite("sulong", fatalIfMissing=False) and not _fastr_suite.isBinarySuite():
# native.recommended runs FastR, it already has a build dependency to the FASTR distribution
# if we are running with sulong we also need the SULONG distribution
- rec = mx.project('com.oracle.truffle.r.native.recommended', fatalIfMissing=False)
- if rec:
- rec.buildDependencies += [mx.distribution('SULONG')]
- else:
- assert _fastr_suite.isBinarySuite()
+ rec = mx.project('com.oracle.truffle.r.native.recommended')
+ rec.buildDependencies += [mx.distribution('SULONG')]
mx_unittest.add_config_participant(_unittest_config_participant)
--
GitLab