diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-11-11 22:04:32 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-11 22:04:33 -0500 |
| commit | 2cfbee896be349d16238c044475c7c15cfb9b3f2 (patch) | |
| tree | 2d6e9dd8b676d493d47c89d318a60735ed21cbf1 /rts/package.conf.in | |
| parent | 7eae862a5af185e918aa29d63a7a9484292513e4 (diff) | |
| download | haskell-2cfbee896be349d16238c044475c7c15cfb9b3f2.tar.gz | |
rts: Fix build when linked with gold
As reported in #12812, the runtime system fails to build when linked
with gold due to a missing dependency on libpthread.
Additionally, rts/package.conf.in uses the WORD_SIZE_IN_BITS macro
defined by MachDeps.h, which it does not #include. Fix this.
Test Plan: Validate with gold linker
Reviewers: hsyl20, austin, erikd, simonmar
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2695
GHC Trac Issues: #12816
Diffstat (limited to 'rts/package.conf.in')
| -rw-r--r-- | rts/package.conf.in | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/rts/package.conf.in b/rts/package.conf.in index 5d8ab8b244..49c572bdd8 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -2,6 +2,7 @@ #include "ghcconfig.h" #include "rts/Config.h" +#include "MachDeps.h" name: rts version: 1.0 @@ -45,17 +46,7 @@ extra-libraries: ,"gdi32" /* for the linker */ ,"winmm" /* for the linker */ #endif -#ifdef freebsd_HOST_OS - , "pthread" /* for pthread_getthreadid_np() */ -#endif -#ifdef openbsd_HOST_OS -/* OpenBSD's libffi is not directly linked to the libpthread but still requires -pthread functionality. This means that any client binary which links with libffi -also need to link with libpthread. If it does not, then linking fails with -unresolved symbols. */ - , "pthread" - -#endif + , "pthread" /* for pthread_getthreadid_np, pthread_create, etc. */ #if defined(DEBUG) && defined(HAVE_LIBBFD) ,"bfd", "iberty" /* for debugging */ #endif |