summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-09-10 20:00:23 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-09-27 22:12:35 -0400
commitc6fb913c085d4e59a017bbfaf772145c485ffcd3 (patch)
treef42ee66d5709c5aa39d16f757067dd520d01d994
parent144abba394c6a23eb877fbde727111a5e75b9d47 (diff)
downloadhaskell-c6fb913c085d4e59a017bbfaf772145c485ffcd3.tar.gz
Just get RTS libs from its package conf
`rts.conf` already contains this exact information in its `extra-libraries` stanza.
-rw-r--r--compiler/main/DriverPipeline.hs19
1 files changed, 0 insertions, 19 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 03a55aef02..cc8b70d80e 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1736,23 +1736,6 @@ linkBinary' staticLink dflags o_files dep_packages = do
-- probably _stub.o files
let extra_ld_inputs = ldInputs dflags
- -- Here are some libs that need to be linked at the *end* of
- -- the command line, because they contain symbols that are referred to
- -- by the RTS. We can't therefore use the ordinary way opts for these.
- let debug_opts | WayDebug `elem` ways dflags = [
-#if defined(HAVE_LIBBFD)
- "-lbfd", "-liberty"
-#endif
- ]
- | otherwise = []
-
- thread_opts | WayThreaded `elem` ways dflags = [
-#if NEED_PTHREAD_LIB
- "-lpthread"
-#endif
- ]
- | otherwise = []
-
rc_objs <- maybeCreateManifest dflags output_fn
let link = if staticLink
@@ -1823,8 +1806,6 @@ linkBinary' staticLink dflags o_files dep_packages = do
++ extraLinkObj:noteLinkObjs
++ pkg_link_opts
++ pkg_framework_opts
- ++ debug_opts
- ++ thread_opts
++ (if platformOS platform == OSDarwin
then [ "-Wl,-dead_strip_dylibs" ]
else [])