Recognize FASTR_FC also in platform.mk

Author: steve-s

com.oracle.truffle.r.native/gnur/edLLVM

@@ -1,5 +1,5 @@
 H
 ,s/CC[[:space:]]=\(.*\)/CC = $(LABS_LLVM_CC)/g
-,s/FC[[:space:]]=\(.*\)/FC = $(FASTR_NATIVE_DIR)\/run\/fastr_tools\/f2c-wrapper\1/g
+,s/FC[[:space:]]=\(.*\)/FC = $(FASTR_NATIVE_DIR)\/run\/fastr_tools\/f2c-wrapper $(FASTR_NATIVE_DIR)\/run\/fastr_tools\/safe-forward-gfortran/g
 w
 q

com.oracle.truffle.r.native/run/fastr_tools/safe-forward-gfortran

@@ -26,8 +26,7 @@
 # it checks that gfortran exists and if not prints out some message suggesting what to do.
 # We do not use the generic safe-forward-tool, because we expect gfortran to be by far the
 # most problematic tool and we want to provide some more gfortan specific guidance.
-
-if [ "${FASTR_FC+dummy}" != dummy ]; then
+if [ ! -z "${FASTR_FC}" ]; then
   exec "$FASTR_FC" "$@"
 elif command -v gfortran>/dev/null; then
   exec gfortran "$@"