Merge branch 'upstream_master' into refactor-run-cmd

Author: LKedward

README.md

@@ -81,4 +81,5 @@ to run, as can `fpm test`; like `fpm run specific_executable`. Command line
 arguments can also be passed to the executable(s) or test(s) with the option
 `--args "some arguments"`.
 
-See additional instructions in the [Packaging guide](PACKAGING.md).
+See additional instructions in the [Packaging guide](PACKAGING.md) or
+the [manifest reference](manifest-reference.md).

bootstrap/src/Build.hs

@@ -105,6 +105,7 @@ buildProgram programDirectory' libraryDirectories sourceExtensions buildDirector
           want [buildDirectory </> programName <.> exe]
           buildDirectory </> programName <.> exe %> \executable -> do
             need objectFiles
+            need archives
             cmd compiler objectFiles archives ["-o", executable] flags
           mapM_ infoToRule compileTimeInfo
 

fpm/src/fpm_backend.f90

@@ -38,6 +38,8 @@ subroutine build_package(model)
         linking = " "
     end if
 
+    linking = linking//" "//model%link_flags
+
     do i=1,size(model%targets)
 
         call build_target(model,model%targets(i)%ptr,linking)

install.sh

@@ -19,14 +19,14 @@ else
   fi
 fi
 
-if [[ -x "$install_path/fpm" ]]; then
+if [ -x "$install_path/fpm" ]; then
   echo "Overwriting existing fpm installation in $install_path"
 fi
 
 cd bootstrap
 stack install
 
-if [[ -x "$install_path/fpm" ]]; then
+if [ -x "$install_path/fpm" ]; then
   echo "fpm installed successfully to $install_path"
 else
   echo "fpm installation unsuccessful: fpm not found in $install_path"