[commit: ghc] wip/nfs-locking: Fix missing directory (c9ae45b)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:09:26 UTC 2017


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

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

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

commit c9ae45b4c7757a54b40f84c6a8532f2d5c2a5418
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Oct 2 18:38:31 2016 +0900

    Fix missing directory
    
    See #289.


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

c9ae45b4c7757a54b40f84c6a8532f2d5c2a5418
 src/Rules/Gmp.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Rules/Gmp.hs b/src/Rules/Gmp.hs
index 0a53102..50c548b 100644
--- a/src/Rules/Gmp.hs
+++ b/src/Rules/Gmp.hs
@@ -38,19 +38,20 @@ gmpRules :: Rules ()
 gmpRules = do
     -- Copy appropriate GMP header and object files
     gmpLibraryH %> \header -> do
-        createDirectory $ takeDirectory header
         windows  <- windowsHost
         configMk <- readFile' $ gmpBase -/- "config.mk"
         if not windows && -- TODO: We don't use system GMP on Windows. Fix?
            any (`isInfixOf` configMk) [ "HaveFrameworkGMP = YES", "HaveLibGmp = YES" ]
         then do
             putBuild "| GMP library/framework detected and will be used"
+            createDirectory $ takeDirectory header
             copyFile (gmpBase -/- "ghc-gmp.h") header
         else do
             putBuild "| No GMP library/framework detected; in tree GMP will be built"
             need [gmpLibrary]
             createDirectory gmpObjects
             build $ Target gmpContext Ar [gmpLibrary] [gmpObjects]
+            createDirectory $ takeDirectory header
             copyFile (gmpBuildPath -/- "gmp.h") header
             copyFile (gmpBuildPath -/- "gmp.h") gmpLibraryInTreeH
 



More information about the ghc-commits mailing list