[GR-21666] [GR-22271] GCC libraries added for Darwin, use gfotran even in the Labs LLVM Toolchain Makeconf version, update the CHANGELOG.

zslajchrt · zslajchrt · commit a109064a739b · 2020-04-19T18:16:04.000Z
PullRequest: fastr/2409
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,17 +2,33 @@
 
 New features:
 
-* `graphics` and `grDevices` packages are now enabled by incorporating the `JavaGD` package. Supported image formats: PDF, PNG, JPEG, BMP. Use `--R.UseInternalGridGraphics=false` to activate this feature.
-	* SVG support will be added in the future
-	* Display lists are fully implemented, which, e.g., makes Shiny work better in FastR
-* Java API for implementing custom graphics devices based on `JavaGD`
-* print stacktraces (aka traceback()) for errors coming from c-code when FastR running in llvm mode
+* Preview of improved graphical support.
+  * Use `--R.UseInternalGridGraphics=false` to activate this feature.
+  * `graphics` and `grDevices` packages are implemented by incorporating the `JavaGD` package.
+  * The standard `grid` package works out of the box as well as `lattice` and `ggplot2`.
+  * Supported image formats: PDF, PNG, JPEG, BMP.
+  * SVG support will be added in the future.
+  * Display lists are fully implemented, which, e.g., makes Shiny work better in FastR.
+  * Custom FastR `grid` package implementation, which is currently the default, will be deprecated and removed in future releases.
+* FastR ships with GCC runtime libraries on all supported systems (Linux and MacOS).
+  * GFortran is not a requirement anymore to run FastR, but it is still required to install R packages with Fortran code
+  * The GFortran runtime libraries versions are 4.8.5 on Linux and 8.3.0 on MacOS. When compiling additional R packages with Fortran code, one must use GFortran of the same or higher version.
+* GFortran is used as the default Fortran compiler even in the "LLVM" toolchain configuration.
+  * R packages that contain Fortran code will not be runnable on
+  the FastR's LLVM backend (`--R.BackEnd=llvm`). However, the default backend is
+  the "native" (`--R.BackEnd=native`). One can also choose to run only specific packages
+  via the LLVM backend (`--R.BackEndLLVM=mypackage`).
+  * Users can switch back to F2C, which can produce libraries runnable on the LLVM backend,
+  by editing variable `FC` in `{FASTR_HOME}/etc/Makeconf`.
+* print stacktraces (in `traceback()`) for errors coming from C/C++ code when FastR is running in the LLVM mode (`--R.BackEnd=llvm`) and errors coming from other languages, e.g., GraalPython.
+* `@` can be also used to access members of polyglot values originating from other languages. This was previously possible only with `$`, now both operators work.
 
 Bug fixes:
 
 * `dyn.load` did not work with relative paths
 * missing warnings on integer overflow #136
 * the f2c script fixed to handle extra dotted file extensions #143
+* `iconv` honors the `from` and `asRaw` parameters. Fixes, e.g.: `iconv('foo²²', 'UTF8', 'latin1')`
 
 # 20.0.0
 
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ overlay : '0a85b559a8872d5255507d626ff8c8b8d32fa497' }
+{ overlay : 'f9c4d02eceb7505244a0e1869290ac70bf88e8f6' }
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.libs b/com.oracle.truffle.r.native/gnur/Makefile.libs
@@ -48,7 +48,7 @@ ifdef FASTR_RELEASE
 ifeq ($(OSNAME), Linux)
   FASTR_CAPTURE_DEPENDENCIES ?= pcre z gfortran quadmath gcc_s
 else ifeq ($(OSNAME), Darwin)
-  FASTR_CAPTURE_DEPENDENCIES ?= pcre z
+  FASTR_CAPTURE_DEPENDENCIES ?= pcre z gfortran quadmath gcc_s
 else
   $(error OS $(OSNAME) is not supported)
 endif
diff --git a/com.oracle.truffle.r.native/gnur/edLLVM b/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
diff --git a/com.oracle.truffle.r.native/run/fastr_etc/Darwin/Makeconf.llvm b/com.oracle.truffle.r.native/run/fastr_etc/Darwin/Makeconf.llvm
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -78,12 +78,25 @@ ECHO_N =
 ECHO_T = 
 F_VISIBILITY = 
 ## FC is the compiler used for all Fortran as from R 3.6.0
-## FastR Note: the tool 'f2c-wrapper' tries to use f2c (bundled with FastR) and
-## if it fails it delegates to the fortran compiler given as the argument.
-## If gfortran is installed in a non-standard location on your system,
-## replace the second path pointing to "safe-forward-gfortran" with the correct
-## path to the gfortran executable on your system.
-FC = "$(R_HOME)/bin/f2c-wrapper" "$(R_HOME)/bin/safe-forward-gfortran"
+##
+## If gfortran is installed in a non-standard location, which is not on $PATH,
+## replace the "$(R_HOME)/bin/safe-forward-gfortran" with the path to gfortran
+## on your system.
+##
+## FastR uses gfortran even for the LLVM toolchain compilation, which implies
+## that R packages that contain Fortran code will not be runnable on the 
+## FastR's LLVM backend (--R.BackEnd=llvm). However, the default backend is
+## the "native" (--R.BackEnd=native) and one can choose to run only specific
+## packages via the LLVM backend (--R.BackEndLLVM=mypackage).
+##
+## FastR also provides tool 'f2c-wrapper' (disabled by default), which tries to
+## use f2c (bundled with FastR) and if it fails it delegates to the Fortran compiler
+## given as the first argument to 'f2c-wrapper'. If the F2C compilation succeeds
+## for all Fortran files in an R package, then the resulting library will contain
+## LLVM bitcode and will be runnable via FastR's LLVM backend.
+FC = "$(R_HOME)/bin/safe-forward-gfortran"
+## To use f2c uncomment the following line
+# FC = "$(R_HOME)/bin/f2c-wrapper" "$(FC)"
 FCFLAGS = -O2 $(LTO)
 ## additional libs needed when linking with $(FC), e.g. on some Oracle compilers
 FCLIBS_XTRA = 
diff --git a/com.oracle.truffle.r.native/run/fastr_etc/Darwin/Makeconf.native b/com.oracle.truffle.r.native/run/fastr_etc/Darwin/Makeconf.native
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,10 @@ ECHO_N =
 ECHO_T = 
 F_VISIBILITY = 
 ## FC is the compiler used for all Fortran as from R 3.6.0
-## FastR Note: the wrapper tries to use f2c, if it fails it uses the tool given as the first argument
+##
+## If gfortran is installed in a non-standard location, which is not on $PATH,
+## replace the "$(R_HOME)/bin/safe-forward-gfortran" with the path to gfortran
+## on your system.
 FC = "$(R_HOME)/bin/safe-forward-gfortran"
 FCFLAGS = -O2 $(LTO)
 ## additional libs needed when linking with $(FC), e.g. on some Oracle compilers
diff --git a/com.oracle.truffle.r.native/run/fastr_etc/Linux/Makeconf.llvm b/com.oracle.truffle.r.native/run/fastr_etc/Linux/Makeconf.llvm
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -78,12 +78,25 @@ ECHO_N = -n
 ECHO_T = 
 F_VISIBILITY = -fvisibility=hidden
 ## FC is the compiler used for all Fortran as from R 3.6.0
-## FastR Note: the tool 'f2c-wrapper' tries to use f2c (bundled with FastR) and
-## if it fails it delegates to the fortran compiler given as the argument.
-## If gfortran is installed in a non-standard location on your system,
-## replace the second path pointing to "safe-forward-gfortran" with the correct
-## path to the gfortran executable on your system.
-FC = "$(R_HOME)/bin/f2c-wrapper" "$(R_HOME)/bin/safe-forward-gfortran"
+##
+## If gfortran is installed in a non-standard location, which is not on $PATH,
+## replace the "$(R_HOME)/bin/safe-forward-gfortran" with the path to gfortran
+## on your system.
+##
+## FastR uses gfortran even for the LLVM toolchain compilation, which implies
+## that R packages that contain Fortran code will not be runnable on the 
+## FastR's LLVM backend (--R.BackEnd=llvm). However, the default backend is
+## the "native" (--R.BackEnd=native) and one can choose to run only specific
+## packages via the LLVM backend (--R.BackEndLLVM=mypackage).
+##
+## FastR also provides tool 'f2c-wrapper' (disabled by default), which tries to
+## use f2c (bundled with FastR) and if it fails it delegates to the Fortran compiler
+## given as the first argument to 'f2c-wrapper'. If the F2C compilation succeeds 
+## for all Fortran files in an R package, then the resulting library will contain
+## LLVM bitcode and will be runnable via FastR's LLVM backend.
+FC = "$(R_HOME)/bin/safe-forward-gfortran"
+## To use f2c uncomment the following line
+# FC = "$(R_HOME)/bin/f2c-wrapper" "$(FC)"
 FCFLAGS = -O2 $(LTO)
 ## additional libs needed when linking with $(FC), e.g. on some Oracle compilers
 FCLIBS_XTRA = 
diff --git a/com.oracle.truffle.r.native/run/fastr_etc/Linux/Makeconf.native b/com.oracle.truffle.r.native/run/fastr_etc/Linux/Makeconf.native
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,10 @@ ECHO_N = -n
 ECHO_T = 
 F_VISIBILITY = -fvisibility=hidden
 ## FC is the compiler used for all Fortran as from R 3.6.0
-## FastR Note: the wrapper tries to use f2c, if it fails it uses the tool given as the first argument
+##
+## If gfortran is installed in a non-standard location, which is not on $PATH,
+## replace the "$(R_HOME)/bin/safe-forward-gfortran" with the path to gfortran
+## on your system.
 FC = "$(R_HOME)/bin/safe-forward-gfortran"
 FCFLAGS = -O2 $(LTO)
 ## additional libs needed when linking with $(FC), e.g. on some Oracle compilers
diff --git a/com.oracle.truffle.r.native/run/fastr_tools/configure_fastr b/com.oracle.truffle.r.native/run/fastr_tools/configure_fastr
@@ -35,39 +35,20 @@ while [ -h "$source" ] ; do
     source="$dir/$source"
   fi
 done
+r_bin="$( cd -P "$( dirname "$source" )" && pwd )"
+FASTR_HOME_DIR="$( dirname "$r_bin" )"
 
 function printHelp {
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-    echo "Checks presence of FastR dependencies and configures the paths in dynamic libraries accordingly."
-    echo "usage: configure_fastr [--help] [--macos-no-homebrew] [--gcc-lib-path <path>]"
-  else
-    echo "Checks presence of FastR dependencies."
-    echo "usage: configure_fastr [--help]"
-  fi    
-    
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-    echo ""
-    echo "optional arguments:"
-    echo "  --gcc-lib-path <path>                       Use the <path> to locate the required gfortran libraries."
-    echo "  --macos-no-homebrew                         Allows the script to proceed even if the target system does not have homebrew"
-  fi
+  echo "Checks FastR requirements and creates personal library directory (R_LIBS_USER)."
+  echo "usage: configure_fastr [--help]"
 }
 
-GCC_LIB_PATH=""
-NO_BREW=0
 while [[ $# -gt 0 ]]; do
   case $1 in
     --help)
       printHelp
       exit 0
     ;;
-    --gcc-lib-path)
-      shift
-      GCC_LIB_PATH=$1
-    ;;
-    --macos-no-homebrew)
-      NO_BREW=1
-    ;;
     *)
       >&2 echo "Unknown option '$1'"
       printHelp
@@ -94,160 +75,42 @@ done
     fi
     if [[ $res != 0 ]]; then
       echo "The basic configuration of FastR failed."
-      echo "To learn more:"
-      echo "  run this script with '--help'"
-      echo "  visit https://www.graalvm.org/docs/reference-manual/languages/r"
+      echo "To learn more visit https://www.graalvm.org/docs/reference-manual/languages/r"
       exit 1
     else
       echo "The basic configuration of FastR was successfull."
       echo ""
       echo "Note: if you intend to install R packages you may need additional dependencies."
-      echo "The following packages should cover the most commonly used R packages:"
+      echo "The following packages should cover depenedencies of the most commonly used R packages:"
       echo "    On Debian based systems: apt-get install build-essential gfortran libxml2 libc++-dev"
       echo "    On Oracle Linux: yum groupinstall 'Development Tools' && yum install gcc-gfortran"
     fi
   elif [[ "$OSTYPE" == "darwin"* ]]; then
-
-    if which brew; then
-      GCC_DARWIN_HOME=/usr/local/Cellar/gcc@4.9/4.9.4_1/lib/gcc/4.9
-      
-      if [ -d "$GCC_DARWIN_HOME" ] ; then
-        echo "gcc 4.9 installation found."
-        
-        cd -P "$( dirname "$source" )/../lib"
-        # correct paths on Mac OSX
-        GFORTRAN_LIBRARIES="libgfortran.3.dylib libquadmath.0.dylib libgomp.1.dylib libgcc_s.1.dylib"
-        TARGET_LIBRARIES="`find ../library/* | grep "\(\.dylib\|\.so\)$"` `find * | grep "\(\.dylib\|\.so\)$"`"
-        for GFORTRAN_LIB in $GFORTRAN_LIBRARIES
-        do
-          LIB_LOCATION="${GCC_DARWIN_HOME}/${GFORTRAN_LIB}"
-          for TARGET_LIB in $TARGET_LIBRARIES
-          do
-            # don't look at symlinks
-            if [ ! -L "${TARGET_LIB}" ] ; then
-              # grep for the current path of this gfortran library in this library's linking info
-              CURRENT_LIB_NAME=`otool -L ${TARGET_LIB} | grep -o "\t.*${GFORTRAN_LIB}"`
-              if [ ! -z "$CURRENT_LIB_NAME" ] ; then
-                if [ "$CURRENT_LIB_NAME" != "$LIB_LOCATION" ] ; then
-                  # change to the new location
-                  echo "changing path to ${GFORTRAN_LIB} in ${TARGET_LIB} to $LIB_LOCATION"
-                  install_name_tool -change $CURRENT_LIB_NAME $LIB_LOCATION ${TARGET_LIB}
-                fi
-              fi
-            fi
-          done
-        done
-      else
-        echo "No Homebrew gcc 4.9 installation found."
-        echo "Please ensure that you have gcc installed on your system using the homebrew command:"
-        echo "   brew install gcc@4.9"
-        
-        HOMEBREW_PREFIX_OUT=`brew config | grep HOMEBREW_PREFIX`
-        HOMEBREW_PREFIX=${HOMEBREW_PREFIX_OUT##*: }
-        if [[ "$HOMEBREW_PREFIX" != "/usr/local" ]]; then
-          echo "Your Homebrew uses other than the default installation directory prefix (i.e. /usr/local)."\
-          "Since FastR assumes the default prefix, use the following command to create a symbolic link to your Homebrew installations:"  
-          echo "   sudo ln -s $HOMEBREW_PREFIX/Cellar /usr/local/Cellar"
-        fi  
-          
-        exit 1
-      fi
-    else # not "which brew"
-      if [ $NO_BREW = 0 ]; then
-        echo "FastR depends on GFortran 3 runtime libraries."
-        echo "It appears that this system does not use the homebrew package manager."
-        echo "We suggest to use homebrew and install the necessary dependencies with:"
-        echo "   brew install gcc@4.9"
-        echo "If you want to use another installation of GFortran 3 libraries, re-run this script with '--macos-no-homebrew'."
-        exit 2
-      fi
-
-      cd -P "$( dirname "$source" )/../lib"
-      # correct paths on Mac OSX
-      GFORTRAN_LIBRARIES="libgfortran.3.dylib libquadmath.0.dylib libgomp.1.dylib libgcc_s.1.dylib"
-      # This allows determining if all libraries were found after the main loop
-      GFORTRAN_LIBRARIES_CHECK="libgfortran libquadmath libgomp libgcc_s"
-      GFORTRAN_LOCATIONS="$GCC_LIB_PATH /opt/local/lib /opt/local/lib/libgcc /usr/local/gfortran/lib"
-      TARGET_LIBRARIES="`find ../library/* | grep "\(\.dylib\|\.so\)$"` `find * | grep "\(\.dylib\|\.so\)$"`"
-      FOUND=""
-      FOUND_FULL=""
-      LAST_FOUND=""
-      for GFORTRAN_LIB in $GFORTRAN_LIBRARIES
-      do
-        # Remove the 'dylib' extension	
-        GFORTRAN_LIB_BASE=${GFORTRAN_LIB%.*}
-        # Remove the number extension
-        GFORTRAN_LIB_BASE=${GFORTRAN_LIB_BASE%.*}
-        if [ "$LAST_FOUND" = "$GFORTRAN_LIB_BASE" ] ; then
-          # A previous version of the current library has already been found
-          echo "skipping $GFORTRAN_LIB"
-          continue;
-        fi
-        for LOCATION in $GFORTRAN_LOCATIONS
-        do
-          if test -f "${LOCATION}/${GFORTRAN_LIB}"; then
-            LIB_LOCATION="${LOCATION}/${GFORTRAN_LIB}"
-            FOUND="$FOUND $GFORTRAN_LIB_BASE"
-            LAST_FOUND=$GFORTRAN_LIB_BASE          
-            echo "${GFORTRAN_LIB} found at ${LIB_LOCATION}"
-            for TARGET_LIB in $TARGET_LIBRARIES
-            do
-              # don't look at symlinks
-              if [ ! -L "${TARGET_LIB}" ] ; then
-                # grep for the current path of this gfortran library in this library's linking info
-                CURRENT_LIB_NAME=`otool -L ${TARGET_LIB} | grep -o "\t.*${GFORTRAN_LIB_BASE}[^ ]*"`
-                if [ ! -z "$CURRENT_LIB_NAME" ] ; then
-                if [ "$CURRENT_LIB_NAME" != "$LIB_LOCATION" ] ; then
-                  # change to the new location
-                  echo "changing path to ${GFORTRAN_LIB} in ${TARGET_LIB} to $LIB_LOCATION"
-                  FOUND_FULL="${FOUND_FULL}\n  ${LIB_LOCATION}"
-                  install_name_tool -change $CURRENT_LIB_NAME $LIB_LOCATION ${TARGET_LIB}
-                fi
-                fi
-              fi
-            done
-            break
-          fi
-        done
-      done
-    
-      if [ "$FOUND" != " $GFORTRAN_LIBRARIES_CHECK" ] ; then
-        echo "From expected libraries '$GFORTRAN_LIBRARIES_CHECK' found only '$FOUND'."
-        echo "Please ensure that you have GFortran 3 installed on your system."
-        echo "We suggest to use homebrew and install the necessary dependencies with:"
-        echo "   brew install gcc@4.9"
-        echo "If the GFortran 3 runtime libraries are installed in a non-standard location, you can specify that location using the '--gcc-lib-path' parameter."
-        exit 1
-      else
-        echo "Succesfully updated FastR installation to use the GFortran 3 system libraries."
-        FASTR_HOME=$(cd ..; pwd -P )
-        echo "The fortran compiler flags in $FASTR_HOME/etc/Makeconf (variable FLIBS) were not updated and must be adjusted manually!"
-      fi
-    fi # which brew
+    echo "The basic configuration of FastR was successfull."
+    echo ""
+    echo "Note: if you intend to install R packages you may need additional dependencies."
+    echo "The most common dependency is GFortran, which must be of version 8.3.0 or later."
+    echo "See https://gcc.gnu.org/wiki/GFortranBinaries."
+    echo "If the 'gfortran' binary is not on the system path, you need to configure the full path to it in $FASTR_HOME_DIR/etc/Makeconf (variable FC)"
   else
     echo "Unknown operating system."
     echo "FastR may still work."
-    echo "Make sure that GCC including gfortran and OpenMP is installed on your system."
+    echo "Make sure that OpenMP runtime library (libgomp.so.1) is installed on your system."
+    echo "If you intend to install R packages you may need additional dependencies."
+    echo "The most common dependency is GFortran."
   fi
 
-  if [[ $CONFIGURE_ETC = 1 ]]; then
-    export GRAALVM_VERSION=`grep -o 'GRAALVM_VERSION=.*' "../../../../release" | cut -d= -f2`
-    cd ../etc
-    echo "Running the configure script..."
-    ./configure --with-x=no --with-aqua=no --enable-memory-profiling FFLAGS=-O2 $CONFIGURE_ARGS > configure.log 2>&1
-    res=$?
-    if [[ $res != 0 ]]; then
-      echo "The configuration step failed."
-    echo "The log was saved into ${PWD}/configure.log"
-    echo "FastR may still work, but compilation of some R packages may fail"
-    exit 1
-  fi
-  ed Makeconf < edMakeconf.etc > /dev/null 2>/dev/null
   export R_DEFAULT_PACKAGES=base
-  R_LIBS_USER=`"../bin/R" --slave -e 'cat(path.expand(Sys.getenv("R_LIBS_USER")))'`
-  echo "Creating user specific library directory: $R_LIBS_USER"
-  mkdir -p "$R_LIBS_USER"
-  echo "DONE"
+  R_LIBS_USER=`"$FASTR_HOME_DIR/bin/R" --slave -e 'cat(path.expand(Sys.getenv("R_LIBS_USER")))'`
+  if [ ! -d "$R_LIBS_USER" ]; then
+    echo
+    read -p "Default personal library directory ($R_LIBS_USER) does exist. Do you wish to create it? (Yy/Nn) " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+      echo "Creating personal library directory: $R_LIBS_USER"
+      mkdir -p "$R_LIBS_USER"
+    fi
   fi
 
+  echo "DONE"
 )
diff --git a/com.oracle.truffle.r.native/run/fastr_tools/install_r_native_image b/com.oracle.truffle.r.native/run/fastr_tools/install_r_native_image
diff --git a/com.oracle.truffle.r.native/run/fastr_tools/safe-forward-gfortran b/com.oracle.truffle.r.native/run/fastr_tools/safe-forward-gfortran
diff --git a/mx.fastr/mx_fastr_dists.py b/mx.fastr/mx_fastr_dists.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ overlay : '0a85b559a8872d5255507d626ff8c8b8d32fa497' }`
	`1`	`+{ overlay : 'f9c4d02eceb7505244a0e1869290ac70bf88e8f6' }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`H`
`2`	`2`	`,s/CC[[:space:]]=\(.*\)/CC = $(LABS_LLVM_CC)/g`
`3`		`-,s/FC[[:space:]]=\(.*\)/FC = $(FASTR_NATIVE_DIR)\/run\/fastr_tools\/f2c-wrapper\1/g`
	`3`	`+,s/FC[[:space:]]=\(.*\)/FC = $(FASTR_NATIVE_DIR)\/run\/fastr_tools\/f2c-wrapper $(FASTR_NATIVE_DIR)\/run\/fastr_tools\/safe-forward-gfortran/g`
`4`	`4`	`w`
`5`	`5`	`q`