diff options
author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-11-10 13:57:08 +0000 |
---|---|---|
committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-11-10 13:57:08 +0000 |
commit | b745a82cc0c2bfd33f1775496420a051f3909e3d (patch) | |
tree | 8407e3c0c29e37d89248d93d9751b74230181047 /bootstrap/src | |
parent | 144046926629b94da1b18ad19038e4c9ec372b2a (diff) | |
parent | d569a89d7d059a5ba914e51d6fd7b32132b33c5e (diff) | |
download | fpm-b745a82cc0c2bfd33f1775496420a051f3909e3d.tar.gz fpm-b745a82cc0c2bfd33f1775496420a051f3909e3d.zip |
Merge branch 'upstream_master' into refactor-run-cmd
Diffstat (limited to 'bootstrap/src')
-rw-r--r-- | bootstrap/src/Build.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bootstrap/src/Build.hs b/bootstrap/src/Build.hs index 083e646..3f647cd 100644 --- a/bootstrap/src/Build.hs +++ b/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 |