diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-10-28 19:02:16 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-02 02:52:48 -0500 |
| commit | 7beb9fff1bee1ccbf7f2258ce527b8d5df2a85ea (patch) | |
| tree | 2868fd769f2a528e67e6e6fa2760b3dab77d5252 /compiler/GHC/Linker | |
| parent | 7b2cf80717a6b16e3f6135c6c6905bd5d3bbde72 (diff) | |
| download | haskell-wip/rts-configure-2.tar.gz | |
rts configure scriptwip/rts-configure-2
Need to use CPP not `if` in rts.buildinfo
Bump cabal submodule to include
https://github.com/haskell/cabal/pull/8565
Diffstat (limited to 'compiler/GHC/Linker')
| -rw-r--r-- | compiler/GHC/Linker/Dynamic.hs | 10 | ||||
| -rw-r--r-- | compiler/GHC/Linker/Static.hs | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/compiler/GHC/Linker/Dynamic.hs b/compiler/GHC/Linker/Dynamic.hs index 171503d4d6..646eab59d4 100644 --- a/compiler/GHC/Linker/Dynamic.hs +++ b/compiler/GHC/Linker/Dynamic.hs @@ -3,8 +3,6 @@ -- | Dynamic linker module GHC.Linker.Dynamic ( linkDynLib - -- * Platform-specifics - , libmLinkOpts ) where @@ -214,7 +212,6 @@ linkDynLib logger tmpfs dflags0 unit_env o_files dep_packages runLink logger tmpfs dflags ( map Option verbFlags - ++ libmLinkOpts platform ++ [ Option "-o" , FileOption "" output_fn ] @@ -230,13 +227,6 @@ linkDynLib logger tmpfs dflags0 unit_env o_files dep_packages ++ map Option pkg_link_opts ) --- | Some platforms require that we explicitly link against @libm@ if any --- math-y things are used (which we assume to include all programs). See #14022. -libmLinkOpts :: Platform -> [Option] -libmLinkOpts platform - | platformHasLibm platform = [Option "-lm"] - | otherwise = [] - {- Note [-Bsymbolic assumptions by GHC] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/compiler/GHC/Linker/Static.hs b/compiler/GHC/Linker/Static.hs index 99495d33fb..d251832694 100644 --- a/compiler/GHC/Linker/Static.hs +++ b/compiler/GHC/Linker/Static.hs @@ -24,7 +24,6 @@ import GHC.Utils.TmpFs import GHC.Linker.MacOS import GHC.Linker.Unit -import GHC.Linker.Dynamic import GHC.Linker.ExtraObj import GHC.Linker.Windows import GHC.Linker.Static.Utils @@ -195,7 +194,6 @@ linkBinary' staticLink logger tmpfs dflags unit_env o_files dep_units = do ++ [ GHC.SysTools.Option "-o" , GHC.SysTools.FileOption "" output_fn ] - ++ libmLinkOpts platform ++ map GHC.SysTools.Option ( [] |