ensure correct mx primary suite for llvm compiler wrappers

d9e35c65 · Mick Jordan · Lukas Stadler · e1d357d0 · d9e35c65 · d9e35c65
Commit d9e35c65 authored 7 years ago by Mick Jordan Committed by Lukas Stadler 7 years ago
--- a/mx.fastr/compilers/fastr-c++
+++ b/mx.fastr/compilers/fastr-c++
@@ -40,7 +40,7 @@ while [ $DIR != "/" ] ; do
 done
 if [ $with_sulong = 1 ] && [ "$FASTR_SULONG_IGNORE" = "" ] ; then
-    mx --dynamicimport sulong fastr-c++ $@
+    MX_PRIMARY_SUITE_PATH=$DIR/fastr mx --dynamicimport sulong fastr-c++ $@
 else
    g++ $@
 fi

--- a/mx.fastr/compilers/fastr-cc
+++ b/mx.fastr/compilers/fastr-cc
@@ -40,7 +40,7 @@ while [ $DIR != "/" ] ; do
 done
 if [ $with_sulong = 1 ] && [ "$FASTR_SULONG_IGNORE" = "" ] ; then
-	mx --dynamicimport sulong fastr-cc $@
+	MX_PRIMARY_SUITE_PATH=$DIR/fastr mx --dynamicimport sulong fastr-cc $@
 else
    gcc $@
 fi

--- a/mx.fastr/compilers/fastr-cpp
+++ b/mx.fastr/compilers/fastr-cpp
@@ -40,7 +40,7 @@ while [ $DIR != "/" ] ; do
 done
 if [ $with_sulong = 1 ] && [ "$FASTR_SULONG_IGNORE" = "" ] ; then
-	mx --dynamicimport sulong fastr-cpp $@
+	MX_PRIMARY_SUITE_PATH=$DIR/fastr mx --dynamicimport sulong fastr-cpp $@
 else
    cpp $@
 fi
--- a/mx.fastr/compilers/fastr-fc
+++ b/mx.fastr/compilers/fastr-fc
@@ -40,7 +40,7 @@ while [ $DIR != "/" ] ; do
 done
 if [ $with_sulong = 1 ] && [ "$FASTR_SULONG_IGNORE" = "" ] ; then
-    mx --dynamicimport sulong fastr-fc $@
+    MX_PRIMARY_SUITE_PATH=$DIR/fastr mx --dynamicimport sulong fastr-fc $@
 else
    gfortran $@
 fi