[commit: ghc] wip/nfs-locking: Merge pull request #183 from kgardas/fix_dirs_to_dir (875d9ca)

[git at git.haskell.org]

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

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

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

commit 875d9ca47a82c58c2e5e99864f67dc5f3559dffc
Merge: 6e00b02 36b7f4d
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 19 08:54:29 2016 +0000

    Merge pull request #183 from kgardas/fix_dirs_to_dir
    
    fix "dirs" to "dir" for gmp and iconv libraries



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

875d9ca47a82c58c2e5e99864f67dc5f3559dffc
 cfg/system.config.in              |  8 ++++----
 src/Oracles/Config/Setting.hs     | 16 ++++++++--------
 src/Rules/Gmp.hs                  |  8 ++++----
 src/Settings/Builders/GhcCabal.hs |  8 ++++----
 src/Settings/Builders/Hsc2Hs.hs   |  4 ++--
 5 files changed, 22 insertions(+), 22 deletions(-)