diff options
| author | Reid Barton <rwbarton@gmail.com> | 2017-04-23 14:03:22 (GMT) |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-23 15:05:48 (GMT) |
| commit | 317ceb41e1efe0566178090fa077c4e6f4f03f10 (patch) | |
| tree | 221ae65b69a97516cfdc315839d9bdb1b8883531 | |
| parent | 18c3a7ea0f7577514721feadefd9a62c228edb60 (diff) | |
| download | ghc-317ceb41e1efe0566178090fa077c4e6f4f03f10.zip ghc-317ceb41e1efe0566178090fa077c4e6f4f03f10.tar.gz ghc-317ceb41e1efe0566178090fa077c4e6f4f03f10.tar.bz2 | |
Only build iserv with -threaded if GhcThreaded is set
By default GhcThreaded is set by
```
GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
```
so it seems incorrect to try to build iserv with -threaded when
GhcThreaded is not set. This came up when I was building GHC with
some strange combination of flavours (debugged and profiled but not
threaded).
Test Plan: harbormaster
Reviewers: simonmar, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie, snowleopard
Differential Revision: https://phabricator.haskell.org/D3429
| -rw-r--r-- | iserv/ghc.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/iserv/ghc.mk b/iserv/ghc.mk index 8497313..ff8b153 100644 --- a/iserv/ghc.mk +++ b/iserv/ghc.mk @@ -20,9 +20,11 @@ iserv_stage2_p_MORE_HC_OPTS += -debug iserv_stage2_dyn_MORE_HC_OPTS += -debug endif +ifeq "$(GhcThreaded)" "YES" iserv_stage2_MORE_HC_OPTS += -threaded iserv_stage2_p_MORE_HC_OPTS += -threaded iserv_stage2_dyn_MORE_HC_OPTS += -threaded +endif # Add -Wl,--export-dynamic enables GHCi to load dynamic objects that # refer to the RTS. This is harmless if you don't use it (adds a bit |