Cheng Shao pushed to branch wip/bump-submodules-2603 at Glasgow Haskell Compiler / GHC

Commits:

5 changed files:

Changes:

  • docs/users_guide/exts/recursive_do.rst
    ... ... @@ -56,7 +56,7 @@ or equivalently
    56 56
     
    
    57 57
     As you can guess ``justOnes`` will evaluate to ``Just [-1,-1,-1,...``.
    
    58 58
     
    
    59
    -GHC's implementation the mdo-notation closely follows the original
    
    59
    +GHC's implementation of the mdo-notation closely follows the original
    
    60 60
     translation as described in the paper `A recursive do for
    
    61 61
     Haskell <https://leventerkok.github.io/papers/recdo.pdf>`__, which
    
    62 62
     in turn is based on the work `Value Recursion in Monadic
    

  • hadrian/src/Rules/ToolArgs.hs
    ... ... @@ -153,6 +153,9 @@ toolTargets = [ cabalSyntax
    153 153
                   , filepath
    
    154 154
                   , fileio
    
    155 155
                   , osString
    
    156
    +              -- os-string/filepath now depend on them
    
    157
    +              , thLift
    
    158
    +              , thQuasiquoter
    
    156 159
                   -- , ghc     -- # depends on ghc library
    
    157 160
                   -- , runGhc  -- # depends on ghc library
    
    158 161
                   , ghcBoot
    
    ... ... @@ -200,4 +203,3 @@ dirMap = do
    200 203
           cd <- readContextData c
    
    201 204
           ids <- liftIO $ mapM canonicalizePath [pkgPath p </> i | i <- srcDirs cd]
    
    202 205
           return $ map (,(p, modules cd ++ otherModules cd)) ids
    203
    -

  • libraries/filepath
    1
    -Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe
    1
    +Subproject commit baac7d7e76449f76fc6785e77206edb5530b6bfb

  • libraries/os-string
    1
    -Subproject commit c08666bf7bf528e607fc1eacc20032ec59e69df3
    1
    +Subproject commit 71f66e1af2288867becaa567dfb10c1d791b0343

  • m4/fp_prog_cc_linker_target.m4
    ... ... @@ -8,7 +8,7 @@
    8 8
     #      a linker
    
    9 9
     AC_DEFUN([FP_PROG_CC_LINKER_TARGET],
    
    10 10
     [
    
    11
    -    AC_MSG_CHECKING([whether $CC used as a linker understands --target])
    
    11
    +    AC_MSG_CHECKING([whether $1 used as a linker understands --target])
    
    12 12
     
    
    13 13
         echo 'int foo() { return 0; }' > conftest1.c
    
    14 14
         echo 'int main() { return 0; }' > conftest2.c
    
    ... ... @@ -20,7 +20,7 @@ AC_DEFUN([FP_PROG_CC_LINKER_TARGET],
    20 20
             # See Note [Don't pass --target to emscripten toolchain] in GHC.Toolchain.Program
    
    21 21
             CONF_CC_SUPPORTS_TARGET=NO
    
    22 22
             AC_MSG_RESULT([no])
    
    23
    -    elif "$CC" $$3 --target=$LlvmTarget -o conftest conftest1.o conftest2.o;
    
    23
    +    elif "$1" $$3 --target=$LlvmTarget -o conftest conftest1.o conftest2.o;
    
    24 24
         then
    
    25 25
             $3="--target=$LlvmTarget $$3"
    
    26 26
             AC_MSG_RESULT([yes])