From d46bb479bc545c74d42c4875e6362eb78524cdf6 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Mon, 27 Nov 2017 16:28:03 +0100
Subject: [PATCH] Directly build GnuR's include path.
---
mx.fastr/mx_fastr_pkgs.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mx.fastr/mx_fastr_pkgs.py b/mx.fastr/mx_fastr_pkgs.py
index d2b20462f6..4ecb45a153 100644
--- a/mx.fastr/mx_fastr_pkgs.py
+++ b/mx.fastr/mx_fastr_pkgs.py
@@ -56,11 +56,12 @@ def _gnur_rscript():
return _mx_gnur().extensions._gnur_rscript_path()
def _gnur_include_path():
+ gnur_include_p = None
if _graalvm():
- return _mx_gnur().extensions._gnur_include_path()
+ gnur_include_p = join(_mx_gnur().dir, 'gnur', _mx_gnur().extensions.r_version(), 'include')
else:
gnur_include_p = join(mx_fastr._gnur_path(), "include")
- return gnur_include_p
+ return gnur_include_p
def _fastr_include_path():
return join(_fastr_suite_dir(), 'include')
--
GitLab