Ben Gamari pushed to branch wip/T25716 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • m4/find_ld.m4
    ... ... @@ -21,14 +21,7 @@ AC_DEFUN([FIND_LD],[
    21 21
                 return
    
    22 22
             fi
    
    23 23
     
    
    24
    -        case $CPU in
    
    25
    -        i386)
    
    26
    -            # We refuse to use ld.gold on i386 due to #23579, which we don't
    
    27
    -            # have a good autoconf check for.
    
    28
    -            linkers="ld.lld ld" ;;
    
    29
    -        *)
    
    30
    -            linkers="ld.lld ld.gold ld" ;;
    
    31
    -        esac
    
    24
    +        linkers="ld.lld ld"
    
    32 25
     
    
    33 26
             # Manually iterate over possible names since we want to ensure that, e.g.,
    
    34 27
             # if ld.lld is installed but gcc doesn't support -fuse-ld=lld, that we
    

  • utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs
    ... ... @@ -91,7 +91,7 @@ findLinkFlags enableOverride cc ccLink
    91 91
               -- executable exists before trying cc.
    
    92 92
               do _ <- findProgram (linker ++ " linker") emptyProgOpt ["ld."++linker]
    
    93 93
                  prog <$ checkLinkWorks cc prog
    
    94
    -        | linker <- ["lld", "gold", "bfd"]
    
    94
    +        | linker <- ["lld", "bfd"]
    
    95 95
             , let prog = over _prgFlags (++["-fuse-ld="++linker]) ccLink
    
    96 96
             ]
    
    97 97
             <|> (ccLink <$ checkLinkWorks cc ccLink)