[commit: ghc] wip/nfs-locking: Undo irrelevant changes in previous commit. (f33acd3)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:53:14 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/f33acd3ee4d702751a4ce766efa57e02666f926a/ghc

>---------------------------------------------------------------

commit f33acd3ee4d702751a4ce766efa57e02666f926a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jan 16 00:56:11 2016 +0000

    Undo irrelevant changes in previous commit.
    
    See #167.


>---------------------------------------------------------------

f33acd3ee4d702751a4ce766efa57e02666f926a
 src/Settings/Builders/Ghc.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Settings/Builders/Ghc.hs b/src/Settings/Builders/Ghc.hs
index 2e40bcb..40b5a0f 100644
--- a/src/Settings/Builders/Ghc.hs
+++ b/src/Settings/Builders/Ghc.hs
@@ -24,8 +24,7 @@ ghcBuilderArgs :: Args
 ghcBuilderArgs = stagedBuilder Ghc ? do
     output <- getOutput
     way    <- getWay
-    let buildObj = ("//*." ++  osuf way) ?== output || ("//*." ++  obootsuf way) ?== output
-        buildHi  = ("//*." ++ hisuf way) ?== output || ("//*." ++ hibootsuf way) ?== output
+    let buildObj = ("//*." ++ osuf way) ?== output || ("//*." ++ obootsuf way) ?== output
     libs    <- getPkgDataList DepExtraLibs
     gmpLibs <- lift $ readFileLines gmpLibNameCache
     libDirs <- getPkgDataList DepLibDirs
@@ -41,8 +40,7 @@ ghcBuilderArgs = stagedBuilder Ghc ? do
             , not buildObj ? append [ "-optl-L" ++ dir | dir <- libDirs ]
             , buildObj ? arg "-c"
             , append =<< getInputs
-            , buildHi ? append ["-fno-code", "-fwrite-interface"]
-            , not buildHi ? mconcat [ arg "-o", arg =<< getOutput ] ]
+            , arg "-o", arg =<< getOutput ]
 
 splitObjectsArgs :: Args
 splitObjectsArgs = splitObjects ? do



More information about the ghc-commits mailing list